commit 5ab2c7cffd034978d2c6537bcf8bb13f0e6ab1b2
parent 19e545b5933797d43edfa4492f2654c73d882db2
Author: Marcel Denia <naoir@gmx.net>
Date: Tue, 28 Oct 2014 13:45:43 +0100
db47: Drop -full variant and integrate it into the normal one
Signed-off-by: Marcel Denia <naoir@gmx.net>
Diffstat:
| M | libs/db47/Makefile | | | 78 | ++++++++++-------------------------------------------------------------------- |
1 file changed, 10 insertions(+), 68 deletions(-)
diff --git a/libs/db47/Makefile b/libs/db47/Makefile
@@ -12,9 +12,9 @@ BASE_VERSION:=4.7.25
PKG_NAME:=db47
PKG_VERSION:=$(BASE_VERSION).4.NC
-PKG_RELEASE:=2
+PKG_RELEASE:=3
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/db-$(BASE_VERSION).NC
+PKG_BUILD_DIR:=$(BUILD_DIR)/db-$(BASE_VERSION).NC
PKG_SOURCE:=db-$(BASE_VERSION).NC.tar.gz
PKG_SOURCE_URL:=http://download.oracle.com/berkeley-db/
PKG_MD5SUM:=073ab7f20d24b3872a51ca762f5090e7
@@ -29,71 +29,30 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
-define Package/libdb47/Default
+define Package/libdb47
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libxml2
- PROVIDES:=libdb47
+ TITLE:=Berkeley DB library (4.7)
URL:=http://www.oracle.com/us/products/database/berkeley-db
-endef
-
-define Package/libdb47/Default/description
- Berkeley DB library (4.7).
-endef
-
-define Package/libdb47
-$(call Package/libdb47/Default)
- VARIANT:=small
- TITLE:=Berkeley DB library (4.7) (without statistics etc. support)
+ PROVIDES:=libdb47-full
endef
define Package/libdb47/description
-$(call Package/libdb47/Default/description)
- This package is not built with statistics etc. support.
-endef
-
-define Package/libdb47-full
-$(call Package/libdb47/Default)
- VARIANT:=full
- TITLE:=Berkeley DB library (4.7) (with statistics etc. support)
-endef
-
-define Package/libdb47-full/description
-$(call Package/libdb47/Default/description)
- This package is built with statistics etc. support.
+ Berkeley DB library (4.7).
endef
-define Package/libdb47xx/Default
+define Package/libdb47xx
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libdb47 $(CXX_DEPENDS)
+ TITLE:=Berkeley DB library (4.7) for C++
URL:=http://www.oracle.com/us/products/database/berkeley-db
-endef
-
-define Package/libdb47xx/Default/description
- Berkeley DB library (4.7). C++ wrapper.
-endef
-
-define Package/libdb47xx
-$(call Package/libdb47xx/Default)
- VARIANT:=small
- TITLE:=Berkeley DB library (4.7) for C++ (without statistics etc. support)
+ PROVIDES:=libdb47xx-full
endef
define Package/libdb47xx/description
-$(call Package/libdb47xx/Default/description)
- This package is not built with statistics etc. support.
-endef
-
-define Package/libdb47xx-full
-$(call Package/libdb47xx/Default)
- VARIANT:=full
- TITLE:=Berkeley DB library (4.7) for C++ (with statistics etc. support)
-endef
-
-define Package/libdb47xx-full/description
-$(call Package/libdb47xx/Default/description)
- This package is built with statistics etc. support.
+ Berkeley DB library (4.7). C++ wrapper.
endef
CONFIGURE_PATH = build_unix
@@ -108,13 +67,8 @@ CONFIGURE_ARGS += \
--disable-rpc \
--enable-compat185 \
--disable-debug \
- --enable-cryptography \
$(if $(CONFIG_PACKAGE_libdb47xx),--enable-cxx,--disable-cxx)
-ifeq ($(BUILD_VARIANT),small)
- CONFIGURE_ARGS += --enable-smallbuild
-endif
-
TARGET_CFLAGS += $(FPIC)
define Build/Compile
@@ -129,21 +83,11 @@ define Package/libdb47/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb-*.so $(1)/usr/lib/
endef
-define Package/libdb47-full/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb-*.so $(1)/usr/lib/
-endef
-
define Package/libdb47xx/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb_cxx-*.so $(1)/usr/lib/
endef
-define Package/libdb47xx-full/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb_cxx-*.so $(1)/usr/lib/
-endef
-
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(1)/usr/include/
@@ -153,6 +97,4 @@ define Build/InstallDev
endef
$(eval $(call BuildPackage,libdb47))
-$(eval $(call BuildPackage,libdb47-full))
$(eval $(call BuildPackage,libdb47xx))
-$(eval $(call BuildPackage,libdb47xx-full))
