Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13676 from brvphoenix/boost

Browse source 
boost: improve package compilation
This commit is contained in:
Rosen Penev 2020-10-19 16:12:40 -07:00 committed by GitHub
commit f501e4cf08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
libs/boost/Makefile
View file

@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=boost PKG_NAME:=boost
PKG_VERSION:=1.74.0 PKG_VERSION:=1.74.0
PKG_SOURCE_VERSION:=1_74_0 PKG_SOURCE_VERSION:=1_74_0
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://dl.bintray.com/boostorg/release/$(PKG_VERSION)/source/ PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://dl.bintray.com/boostorg/release/$(PKG_VERSION)/source/
@ -80,7 +80,7 @@ There are many more header-only libraries supported by Boost.
See more at http://www.boost.org/doc/libs/1_74_0/ See more at http://www.boost.org/doc/libs/1_74_0/
endef endef
PKG_BUILD_DEPENDS:=boost/host PACKAGE_boost-python3:python3 PKG_BUILD_DEPENDS:=boost/host
include ../../lang/python/python3-version.mk include ../../lang/python/python3-version.mk
BOOST_PYTHON3_VER=$(PYTHON3_VERSION) BOOST_PYTHON3_VER=$(PYTHON3_VERSION)
@ -302,12 +302,17 @@ endef
define Build/Configure define Build/Configure
endef endef
define Package/boost/Default/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* $(1)/usr/lib/
endef
# 1: short name # 1: short name
# 2: dependencies on other boost libraries (short name) # 2: dependencies on other boost libraries (short name)
# 3: dependencies on other packages # 3: dependencies on other packages
# 4: conditional/inward dependencies # 4: conditional/inward dependencies
# 5: dependencies compiled only when this package has been selected
define DefineBoostLibrary define DefineBoostLibrary
BOOST_DEPENDS+= +$(if $(4),$(4):boost-$(1),boost-$(1)) BOOST_DEPENDS+= +$(if $(4),$(4):boost-$(1),boost-$(1))
PKG_CONFIG_DEPENDS+= CONFIG_PACKAGE_boost-$(1) PKG_CONFIG_DEPENDS+= CONFIG_PACKAGE_boost-$(1)
@ -316,13 +321,17 @@ define DefineBoostLibrary
define Package/boost-$(1) define Package/boost-$(1)
$(call Package/boost/Default) $(call Package/boost/Default)
TITLE+= ($(1)) TITLE+= ($(1))
DEPENDS+= $$(foreach lib,$(2),+boost-$$(lib)) $(3) $(if $(4),@$(4),) $(patsubst %,+PACKAGE_boost-$(1):%,$(5)) DEPENDS+= $(foreach lib,$(2),+boost-$(lib)) $(3) $(if $(4),@$(4),) $(patsubst %,+PACKAGE_boost-$(1):%,$(5))
HIDDEN:=1 HIDDEN:=1
endef endef
define Package/boost-$(1)/description define Package/boost-$(1)/description
This package contains the Boost $(1) library. This package contains the Boost $(1) library.
endef endef
define Package/boost-$(1)/install
$(if $(CONFIG_boost-static-libs),true,$(call Package/boost/Default/install,$$(1),$(1)))
endef
endef endef
$(eval $(call DefineBoostLibrary,atomic,system)) $(eval $(call DefineBoostLibrary,atomic,system))
@ -343,7 +352,7 @@ $(eval $(call DefineBoostLibrary,math))
#$(eval $(call DefineBoostLibrary,mpi,,)) # OpenMPI does no exist in OpenWRT at this time. #$(eval $(call DefineBoostLibrary,mpi,,)) # OpenMPI does no exist in OpenWRT at this time.
$(eval $(call DefineBoostLibrary,nowide)) $(eval $(call DefineBoostLibrary,nowide))
$(eval $(call DefineBoostLibrary,program_options)) $(eval $(call DefineBoostLibrary,program_options))
$(eval $(call DefineBoostLibrary,python3)) $(eval $(call DefineBoostLibrary,python3,,,,python3-base))
$(eval $(call DefineBoostLibrary,random,system)) $(eval $(call DefineBoostLibrary,random,system))
$(eval $(call DefineBoostLibrary,regex)) $(eval $(call DefineBoostLibrary,regex))
$(eval $(call DefineBoostLibrary,serialization)) $(eval $(call DefineBoostLibrary,serialization))
@ -368,10 +377,10 @@ define Host/Compile
endef endef
CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR) CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR)
TARGET_LDFLAGS += -pthread -lrt TARGET_LDFLAGS += -pthread -lrt -lstdc++ -Wl,--gc-sections,--as-needed,--print-gc-sections
TARGET_CFLAGS += \ TARGET_CFLAGS += \
$(if $(CONFIG_SOFT_FLOAT),-DBOOST_NO_FENV_H) -fPIC $(if $(CONFIG_SOFT_FLOAT),-DBOOST_NO_FENV_H) -fPIC -ffunction-sections -fdata-sections -flto
EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-std=gnu++20,$(if $(CONFIG_GCC_USE_VERSION_5),-std=gnu++14,-std=gnu++17)) EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-std=gnu++20,$(if $(CONFIG_GCC_USE_VERSION_5),-std=gnu++14,-std=gnu++17))
@ -481,28 +490,16 @@ define Host/Install
$(CP) $(HOST_BUILD_DIR)/tools/build/src/engine/b2 $(STAGING_DIR_HOSTPKG)/bin/ $(CP) $(HOST_BUILD_DIR)/tools/build/src/engine/b2 $(STAGING_DIR_HOSTPKG)/bin/
endef endef
define Package/boost/Default/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* $(1)/usr/lib/
endef
define Package/boost-test/install define Package/boost-test/install
$(if $(CONFIG_boost-static-libs),true,
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/lib/libboost_unit_test_framework*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/lib/libboost_{unit_test_framework,prg_exec_monitor}*.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/lib/libboost_prg_exec_monitor*.so* $(1)/usr/lib/ )
endef
define BuildBoostLibrary
define Package/boost-$(1)/install
$(call Package/boost/Default/install,$$(1),$(1))
endef
$$(eval $$(call BuildPackage,boost-$(1)))
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))
$(foreach lib,$(BOOST_LIBS),$(eval $(call BuildBoostLibrary,$(lib)))) $(foreach lib,$(BOOST_LIBS),$(eval $(call BuildPackage,boost-$(lib))))
$(eval $(call BuildPackage,boost-test)) $(eval $(call BuildPackage,boost-test))
$(eval $(call BuildPackage,boost-libs)) $(eval $(call BuildPackage,boost-libs))
$(eval $(call BuildPackage,boost)) $(eval $(call BuildPackage,boost))