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

Boost Makefile Update - Release 6

Browse source 
This update solves two issues:
 1) Incompatibility with the combination of using Target mpc85xx and uclibc at the same time[1].
   - For now, Boost is disabled when the respective combination is detected.
 2) The selection of Boost.Locale was not activating the build with full language support.

 [1] - https://github.com/openwrt/packages/issues/1621

Signed-off-by: Carlos Ferreira <carlosmf.pt@gmail.com>
This commit is contained in:
claymore 2015-07-30 04:02:18 +01:00
parent 76e84e8be9
commit 5586dce88d
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/boost/Makefile
View file

@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/target.mk
PKG_NAME:=boost PKG_NAME:=boost
PKG_VERSION:=1_58_0 PKG_VERSION:=1_58_0
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/boost PKG_SOURCE_URL:=@SF/boost
@ -34,13 +34,13 @@ PKG_USE_MIPS16:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
# For now, the combination TARGET_mpc85xx&&USE_UCLIBC disables boost due to incompatibility
define Package/boost/Default define Package/boost/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Boost C++ source library TITLE:=Boost C++ source library
URL:=http://www.boost.org URL:=http://www.boost.org
DEPENDS:=+libstdcpp +libpthread +librt DEPENDS:=@(!(TARGET_mpc85xx&&USE_UCLIBC)) +libstdcpp +libpthread +librt
endef endef
define Package/boost/description/Default define Package/boost/description/Default
@ -72,10 +72,11 @@ define Package/boost/install
true true
endef endef
# For now, the combination TARGET_mpc85xx&&USE_UCLIBC disables boost due to incompatibility
define Package/boost define Package/boost
$(call Package/boost/Default) $(call Package/boost/Default)
TITLE+= packages TITLE+= packages
DEPENDS:=+ALL:boost-libs +ALL:boost-test DEPENDS:=@(!(TARGET_mpc85xx&&USE_UCLIBC)) +ALL:boost-libs +ALL:boost-test
endef endef
define Package/boost/config define Package/boost/config
@ -148,7 +149,7 @@ $(eval $(call DefineBoostLibrary,filesystem,system,))
$(eval $(call DefineBoostLibrary,graph,regex,)) $(eval $(call DefineBoostLibrary,graph,regex,))
#$(eval $(call DefineBoostLibrary,graph_parallel,,)) #$(eval $(call DefineBoostLibrary,graph_parallel,,))
$(eval $(call DefineBoostLibrary,iostreams,,+zlib)) $(eval $(call DefineBoostLibrary,iostreams,,+zlib))
$(eval $(call DefineBoostLibrary,locale,system,$(ICONV_DEPENDS))) $(eval $(call DefineBoostLibrary,locale,system,$(ICONV_DEPENDS) +@BUILD_NLS))
$(eval $(call DefineBoostLibrary,log,system chrono date_time thread filesystem regex,)) $(eval $(call DefineBoostLibrary,log,system chrono date_time thread filesystem regex,))
$(eval $(call DefineBoostLibrary,math,,)) $(eval $(call DefineBoostLibrary,math,,))
#$(eval $(call DefineBoostLibrary,mpi,,)) #$(eval $(call DefineBoostLibrary,mpi,,))