libzdb: update to 3.2

Removed most patches. The last was upstreamed and the others can be worked
around using Makefile.

Removed inactive maintainer.

Added PKG_BUILD_PARALLEL for faster compilation.

Fixed license information.

Massive reorganization of Makefile for consistency between packages.

Removed --with-sql options. These are totally broken when cross compiling.
Leaving them out works just as well.

Added cpp patch as the test needs a header.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 496ee7f91b)
This commit is contained in:
Rosen Penev
2020-01-25 18:32:50 -08:00
committed by Josef Schlehofer
parent 7c5fe897f6
commit 43db5293ce
5 changed files with 43 additions and 245 deletions
+25 -28
View File
@@ -8,29 +8,32 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libzdb
PKG_VERSION:=3.1
PKG_RELEASE:=6
PKG_LICENSE:=GPL-3.0
PKG_VERSION:=3.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tildeslash.com/libzdb/dist/
PKG_HASH:=0f01abb1b01d1a1f4ab9b55ad3ba445d203fc3b4757abdf53e1d85e2b7b42695
PKG_SOURCE_URL:=https://www.tildeslash.com/libzdb/dist/
PKG_HASH:=005ddf4b29c6db622e16303298c2f914dfd82590111cea7cfd09b4acf46cf4f2
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=libzdb/host
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
# libzdb needs to find iconv when linking to libmariadb
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/libzdb
SECTION:=libs
CATEGORY:=Libraries
TITLE:=A thread-safe multi database connection pool library
MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
URL:=http://www.tildeslash.com/libzdb/
URL:=https://www.tildeslash.com/libzdb/
DEPENDS:=+libsqlite3 +libpq +libmysqlclient +zlib +libpthread +libopenssl
endef
@@ -42,17 +45,16 @@ define Package/libzdb/description
NOTE: This package does not include Oracle support.
endef
CONFIGURE_ARGS += --disable-profiling \
--enable-optimized \
--with-mysql \
--with-postgresql \
--with-sqlite \
--enable-sqliteunlock \
--enable-openssl
CONFIGURE_ARGS += \
--disable-profiling \
--enable-optimized \
--enable-protected \
--enable-sqliteunlock \
--enable-openssl
TARGET_CPPFLAGS += -std=c99
include $(INCLUDE_DIR)/host-build.mk
CONFIGURE_VARS += \
libzdb_cv_setjmp_available=yes \
libzdb_cv_vsnprintf_c11_conformant=yes
define Hooks/HostConfigure/Pre
endef
@@ -66,21 +68,15 @@ endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOSTPKG)/bin/
endef
$(eval $(call HostBuild))
define Build/Compile
$(call Build/Compile/Default)
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOSTPKG)/bin/
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/zdb
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/include/zdb/ $(1)/usr/include/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zdb/* $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzdb* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zdb.pc $(1)/usr/lib/pkgconfig
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zdb.pc $(1)/usr/lib/pkgconfig
endef
define Package/libzdb/install
@@ -88,4 +84,5 @@ define Package/libzdb/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzdb.so* $(1)/usr/lib/
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,libzdb))