Merge pull request #10318 from jalowiczor/master
poco:InstallDev section changed due to poco all problems
This commit is contained in:
commit
558161f3e3
1 changed files with 6 additions and 3 deletions
|
@ -77,20 +77,22 @@ CONFIGURE_ARGS += \
|
||||||
ifeq ($(BUILD_VARIANT),all)
|
ifeq ($(BUILD_VARIANT),all)
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--typical
|
--typical
|
||||||
|
POCO_LIBS={Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings}
|
||||||
else
|
else
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--poquito \
|
--poquito \
|
||||||
--minimal
|
--minimal
|
||||||
|
POCO_LIBS={Foundation,XML,JSON,Net,Util}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
define Package/poco/install
|
define Package/poco/install
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(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
|
endef
|
||||||
|
|
||||||
define Package/poco-all/install
|
define Package/poco-all/install
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(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
|
endef
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
|
@ -98,8 +100,9 @@ define Build/InstallDev
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/
|
||||||
|
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(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
|
endef
|
||||||
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,poco))
|
$(eval $(call BuildPackage,poco))
|
||||||
$(eval $(call BuildPackage,poco-all))
|
$(eval $(call BuildPackage,poco-all))
|
||||||
|
|
Loading…
Reference in a new issue