From a61fee9f157ef709e47f35c9b421dea2a61b3d08 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 24 Mar 2018 09:47:03 +0100 Subject: [PATCH] boost166: fix provides --- dev-libs/boost/boost166-1.66.0.recipe | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dev-libs/boost/boost166-1.66.0.recipe b/dev-libs/boost/boost166-1.66.0.recipe index 2f5d54bb1..5030d50cb 100644 --- a/dev-libs/boost/boost166-1.66.0.recipe +++ b/dev-libs/boost/boost166-1.66.0.recipe @@ -8,7 +8,7 @@ testing. It contains over eighty individual libraries. HOMEPAGE="http://www.boost.org/" SOURCE_URI="https://dl.bintray.com/boostorg/release/$portVersion/source/boost_${portVersion//./_}.tar.bz2" CHECKSUM_SHA256="5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9" -REVISION="1" +REVISION="2" LICENSE="Boost v1.0" COPYRIGHT="1998-2017 Beman Dawes, David Abrahams, Rene Rivera, et al." SOURCE_DIR="boost_${portVersion//./_}" @@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="x86" libVersion="$portVersion compat >= 1.66.0" PROVIDES=" - boost165$secondaryArchSuffix = $portVersion + boost166$secondaryArchSuffix = $portVersion lib:libboost_atomic$secondaryArchSuffix = $libVersion lib:libboost_chrono$secondaryArchSuffix = $libVersion lib:libboost_container$secondaryArchSuffix = $libVersion @@ -62,8 +62,9 @@ REQUIRES=" lib:libz$secondaryArchSuffix " -PROVIDES_devel=" - boost165${secondaryArchSuffix}_devel = $portVersion +# List of devel entries matching an actual library (for use in prepareInstalledDevelLibs) +# Boost also provides header-only libraries (because templates) +devel_libs=" devel:libboost_atomic$secondaryArchSuffix = $portVersion devel:libboost_chrono$secondaryArchSuffix = $portVersion devel:libboost_container$secondaryArchSuffix = $portVersion @@ -97,11 +98,17 @@ PROVIDES_devel=" devel:libboost_unit_test_framework$secondaryArchSuffix = $portVersion devel:libboost_wave$secondaryArchSuffix = $portVersion devel:libboost_wserialization$secondaryArchSuffix = $portVersion +" + +PROVIDES_devel=" + boost166${secondaryArchSuffix}_devel = $portVersion + $devel_libs + devel:libboost_config$secondaryArchSuffix = $portVersion " REQUIRES_devel=" haiku$secondaryArchSuffix >= r1~alpha4_pm_hrev51470 - boost165$secondaryArchSuffix == $portVersion + boost166$secondaryArchSuffix == $portVersion " BUILD_REQUIRES=" @@ -156,7 +163,7 @@ INSTALL() --without-python \ install - prepareInstalledDevelLibs `echo "$PROVIDES_devel" | sed -n \ + prepareInstalledDevelLibs `echo "$devel_libs" | sed -n \ -e "s/devel:\(.*\)$secondaryArchSuffix =.*/\1/p"` packageEntries devel $developDir