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

Merge pull request #3497 from thess/boost-build

Browse source 
boost: Fix python packages. Remove boost-libs from boost meta package…
This commit is contained in:
Ted Hess 2016-11-09 17:36:45 -05:00 committed by GitHub
commit 79aa1c43d2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/boost/Makefile
View file

@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/target.mk
PKG_NAME:=boost PKG_NAME:=boost
PKG_VERSION:=1.62.0 PKG_VERSION:=1.62.0
PKG_SOURCE_VERSION:=1_62_0 PKG_SOURCE_VERSION:=1_62_0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION) PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION)
@ -91,8 +91,7 @@ There are many more header-only libraries supported by Boost.
See more at http://www.boost.org/doc/libs/1_62_0/ See more at http://www.boost.org/doc/libs/1_62_0/
endef endef
PKG_BUILD_DEPENDS:=boost/host PKG_BUILD_DEPENDS:=boost/host PACKAGE_python:python PACKAGE_python3:python3
HOST_BUILD_DEPENDS:=PACKAGE_python:python/host PACKAGE_python3:python3/host
BOOST_LIBS = BOOST_LIBS =
@ -120,7 +119,6 @@ endef
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
endef endef
define Package/boost/config define Package/boost/config
@ -228,6 +226,7 @@ define Package/boost/config
config boost-libs-all config boost-libs-all
bool "Include all Boost libraries." bool "Include all Boost libraries."
default m if ALL
select PACKAGE_boost-libs select PACKAGE_boost-libs
select boost-test-pkg select boost-test-pkg
select boost-coroutine2 select boost-coroutine2
@ -235,6 +234,7 @@ define Package/boost/config
config boost-test-pkg config boost-test-pkg
bool "Boost test package." bool "Boost test package."
default m if ALL
select PACKAGE_boost-test select PACKAGE_boost-test
config boost-coroutine2 config boost-coroutine2
@ -428,7 +428,9 @@ define Package/boost/Default/install
$(1)/usr/lib $(1)/usr/lib
$(FIND) \ $(FIND) \
$(PKG_INSTALL_DIR)/lib/ -name 'libboost_$(2)*.so*' -exec $(CP) {} $(1)/usr/lib/ \; $(PKG_INSTALL_DIR)/lib/ -name 'libboost_$(2).so*' -exec $(CP) {} $(1)/usr/lib/ \;
$(FIND) \
$(PKG_INSTALL_DIR)/lib/ -name 'libboost_$(2)_*.so*' -exec $(CP) {} $(1)/usr/lib/ \;
endef endef
define Package/boost-test/install define Package/boost-test/install