diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-10-22 18:54:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 18:54:03 -0700 |
| commit | 558161f3e33e41c307022053c8f6cf9999fe2030 (patch) | |
| tree | 025ccec0c2f6502f5e0377c2ec983ecdecf5b8a3 /libs | |
| parent | ded6468744f6cda3adfedb1e560a5249c964e3a7 (diff) | |
| parent | 4712deffa57c9f919b1e60238daff7d164f6a695 (diff) | |
Merge pull request #10318 from jalowiczor/master
poco:InstallDev section changed due to poco all problems
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/poco/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/poco/Makefile b/libs/poco/Makefile index 680e5001a..1b97fb739 100644 --- a/libs/poco/Makefile +++ b/libs/poco/Makefile @@ -77,20 +77,22 @@ CONFIGURE_ARGS += \ 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{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ endef define Package/poco-all/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco{Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ endef define Build/InstallDev @@ -98,8 +100,9 @@ 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{Foundation,XML,JSON,Net,Util}.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/ endef + $(eval $(call BuildPackage,poco)) $(eval $(call BuildPackage,poco-all)) |