From c2fc267476d94304f8ea91b370f438e0e1d38985 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Oct 2021 18:57:46 -0700 Subject: [PATCH] poco: switch to building with cmake Faster and works with mips64 targets. Removed all options as the defaults are updated. Added new dependencies. Signed-off-by: Rosen Penev --- libs/poco/Makefile | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 1f431db0f4..d14ed96bb5 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -22,18 +22,15 @@ endif PKG_SOURCE:=$(PKG_NAME)-$(_PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION) PKG_MAINTAINER:=Jean-Michel Julien PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:pocoproject:poco -PKG_BUILD_DEPENDS:=postgresql -PKG_BUILD_PARALLEL:=1 -PKG_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION) - include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/poco SECTION:=libs @@ -55,7 +52,7 @@ define Package/poco-all SECTION:=libs CATEGORY:=Libraries TITLE+=(Complete Edition) - DEPENDS+=+libopenssl + DEPENDS+=+libopenssl +libmariadb +libpq +unixodbc VARIANT:=all endef @@ -66,34 +63,14 @@ define Package/poco-all/description all libraries. endef -CONFIGURE_ARGS += \ - --config=Linux \ - --no-tests \ - --no-samples \ - --no-fpenvironment \ - --no-sharedmemory \ - --no-wstring \ - --shared - -ifeq ($(BUILD_VARIANT),all) - CONFIGURE_ARGS += \ - --typical - POCO_LIBS={Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings} -else - CONFIGURE_ARGS += \ - --poquito \ - --minimal - POCO_LIBS={Foundation,XML,JSON,Net,Util} -endif - define Package/poco/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco*.so* $(1)/usr/lib/ endef define Package/poco-all/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco*.so* $(1)/usr/lib/ endef define Build/InstallDev @@ -101,7 +78,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco*.so* $(1)/usr/lib/ endef