From 8cd0e1d77a65b2ba724e32775bc3c46cd70eec5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 18 Dec 2013 22:43:38 +0000 Subject: [PATCH 01/12] Boost 1.55 First recipe --- dev-libs/boost/boost-1.55.0.recipe | 185 ++++++++++++++++++++++++++--- 1 file changed, 167 insertions(+), 18 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 3269e6f00..03723af63 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -16,6 +16,7 @@ ARCHITECTURES="?x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="boost_1_55_0" PATCHES="boost-1.55.0.patch" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" lib:boost = 1.55.0 @@ -33,38 +34,43 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libiconv + devel:libbz2 + devel:libz " REQUIRES=" lib:libiconv + lib:libbz2 + lib:libz " BUILD() { ./bootstrap.sh \ --without-icu \ - --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ - --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` + --prefix=$prefix \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir ./bjam \ - -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \ - -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \ + -sICU_PATH=$prefix \ + -sICONV_PATH=$prefix \ -d2 \ --without-mpi \ - --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \ - --libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \ + --prefix=$prefix \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir \ --enable-threads=posix \ --enable-thread-local-alloc \ - --enable-parallel-mark \ + --enable-parallel-mark \ inlining=on \ - linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \ + linkflags=-L$libDir \ threading=multi \ variant=release \ link=shared \ runtime-link=shared + --without-python } INSTALL() @@ -72,17 +78,160 @@ INSTALL() ./bjam install \ -d2 \ --prefix=$prefix \ - #--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \ - #--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \ - #--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \ + --exec-prefix=$binDir \ + --libdir=$libDir \ + --includedir=$includeDir \ inlining=on \ - --without-mpi + --without-mpi \ + --without-python + + packageEntries devel $includeDir + packageEntries atomic $libDir/*atomic* + packageEntries chrono $libDir/*chrono* + packageEntries date_time $libDir/*date_time* + packageEntries exception $libDir/*exception* + packageEntries filesystem $libDir/*filesystem* + packageEntries graph $libDir/*graph* + packageEntries iostreams $libDir/*iostreams* + packageEntries locale $libDir/*locale* + packageEntries log $libDir/*log* + packageEntries math $libDir/*math* + packageEntries program_options $libDir/*program_options* + packageEntries random $libDir/*random* + packageEntries regex $libDir/*regex* + packageEntries serialization $libDir/*serialization* + packageEntries signals $libDir/*signals* + packageEntries system $libDir/*system* + packageEntries test $libDir/*test* + packageEntries thread $libDir/*thread* + packageEntries timer $libDir/*timer* + packageEntries wave $libDir/*wave* } PROVIDES_devel=" - boost${secondaryArchSuffix} = $portVersion + boost_devel$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - boost${secondaryArchSuffix} == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion " +PROVIDES_atomic=" + boost_atomic$secondaryArchSuffix = $portVersion +" +REQUIRES_atomic=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_chrono=" + boost_chrono$secondaryArchSuffix = $portVersion +" +REQUIRES_chrono=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_date_time=" + boost_date_time$secondaryArchSuffix = $portVersion +" +REQUIRES_date_time=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_exception=" + boost_exception$secondaryArchSuffix = $portVersion +" +REQUIRES_exception=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_filesystem=" + boost_filesystem$secondaryArchSuffix = $portVersion +" +REQUIRES_filesystem=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_graph=" + boost_graph$secondaryArchSuffix = $portVersion +" +REQUIRES_graph=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_iostreams=" + boost_iostreams$secondaryArchSuffix = $portVersion +" +REQUIRES_iostreams=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_locale=" + boost_locale$secondaryArchSuffix = $portVersion +" +REQUIRES_locale=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_log=" + boost_log$secondaryArchSuffix = $portVersion +" +REQUIRES_log=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_math=" + boost_math$secondaryArchSuffix = $portVersion +" +REQUIRES_math=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_program_options=" + boost_program_options$secondaryArchSuffix = $portVersion +" +REQUIRES_program_options=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion +" +REQUIRES_random=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_regex=" + boost_regex$secondaryArchSuffix = $portVersion +" +REQUIRES_regex=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_serialization=" + boost_serialization$secondaryArchSuffix = $portVersion +" +REQUIRES_serialization=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_signals=" + boost_signals$secondaryArchSuffix = $portVersion +" +REQUIRES_signals=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_system=" + boost_system$secondaryArchSuffix = $portVersion +" +REQUIRES_system=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_test=" + boost_test$secondaryArchSuffix = $portVersion +" +REQUIRES_test=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_thread=" + boost_thread$secondaryArchSuffix = $portVersion +" +REQUIRES_thread=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_timer=" + boost_timer$secondaryArchSuffix = $portVersion +" +REQUIRES_timer=" + haiku$secondaryArchSuffix >= $haikuVersion +" +PROVIDES_wave=" + boost_wave$secondaryArchSuffix = $portVersion +" +REQUIRES_wave=" + haiku$secondaryArchSuffix >= $haikuVersion +" From 75b9915aa3dab2bbc6f5696256ee601ac10124bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 18 Dec 2013 23:08:38 +0000 Subject: [PATCH 02/12] Fixed dependencies --- dev-libs/boost/boost-1.55.0.recipe | 172 ++++++++++++++++++----------- 1 file changed, 106 insertions(+), 66 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 03723af63..a60c44c22 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -69,8 +69,9 @@ BUILD() threading=multi \ variant=release \ link=shared \ - runtime-link=shared - --without-python + runtime-link=shared \ + --without-python \ + --disable-icu } INSTALL() @@ -111,127 +112,166 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " - -REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion - " PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion " -REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " -REQUIRES_chrono=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion " -REQUIRES_date_time=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_exception=" boost_exception$secondaryArchSuffix = $portVersion " -REQUIRES_exception=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_filesystem=" boost_filesystem$secondaryArchSuffix = $portVersion " -REQUIRES_filesystem=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_graph=" boost_graph$secondaryArchSuffix = $portVersion " -REQUIRES_graph=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_iostreams=" boost_iostreams$secondaryArchSuffix = $portVersion " -REQUIRES_iostreams=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_locale=" boost_locale$secondaryArchSuffix = $portVersion " -REQUIRES_locale=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_log=" boost_log$secondaryArchSuffix = $portVersion " -REQUIRES_log=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_math=" boost_math$secondaryArchSuffix = $portVersion " -REQUIRES_math=" - haiku$secondaryArchSuffix >= $haikuVersion +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion " PROVIDES_program_options=" boost_program_options$secondaryArchSuffix = $portVersion " -REQUIRES_program_options=" - haiku$secondaryArchSuffix >= $haikuVersion -" -PROVIDES_random=" - boost_random$secondaryArchSuffix = $portVersion -" -REQUIRES_random=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_regex=" boost_regex$secondaryArchSuffix = $portVersion " -REQUIRES_regex=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_serialization=" boost_serialization$secondaryArchSuffix = $portVersion " -REQUIRES_serialization=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_signals=" boost_signals$secondaryArchSuffix = $portVersion " -REQUIRES_signals=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_system=" boost_system$secondaryArchSuffix = $portVersion " -REQUIRES_system=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_test=" boost_test$secondaryArchSuffix = $portVersion " -REQUIRES_test=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_thread=" boost_thread$secondaryArchSuffix = $portVersion " -REQUIRES_thread=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_timer=" boost_timer$secondaryArchSuffix = $portVersion " -REQUIRES_timer=" - haiku$secondaryArchSuffix >= $haikuVersion -" PROVIDES_wave=" boost_wave$secondaryArchSuffix = $portVersion " -REQUIRES_wave=" + +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +REQUIRES_atomic=" haiku$secondaryArchSuffix >= $haikuVersion " + +REQUIRES_chrono=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_date_time=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_exception=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_filesystem=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_graph=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_regex$secondaryArchSuffix = $portVersion +" + +REQUIRES_iostreams=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_locale=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" + +REQUIRES_log=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_date_time$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" + +REQUIRES_math=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_program_options=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_random=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_regex=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_serialization=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_signals=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_system=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_test=" + haiku$secondaryArchSuffix >= $haikuVersion +" + +REQUIRES_thread=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_system$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix = $portVersion +" + +REQUIRES_timer=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion +" + +REQUIRES_wave=" + haiku$secondaryArchSuffix >= $haikuVersion + boost_chrono$secondaryArchSuffix = $portVersion + boost_date_time$secondaryArchSuffix = $portVersion + boost_filesystem$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix = $portVersion + boost_thread$secondaryArchSuffix = $portVersion +" From 4a486704d8337bf59ddbaf424724a30018ddad1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 00:07:34 +0000 Subject: [PATCH 03/12] Fixed dependecies equals --- dev-libs/boost/boost-1.55.0.recipe | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a60c44c22..0537980f5 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -183,7 +183,7 @@ REQUIRES_atomic=" REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_date_time=" @@ -196,12 +196,12 @@ REQUIRES_exception=" REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion - boost_regex$secondaryArchSuffix = $portVersion + boost_regex$secondaryArchSuffix == $portVersion " REQUIRES_iostreams=" @@ -210,17 +210,17 @@ REQUIRES_iostreams=" REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_date_time$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " REQUIRES_math=" @@ -257,21 +257,21 @@ REQUIRES_test=" REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion - boost_system$secondaryArchSuffix = $portVersion - boost_chrono$secondaryArchSuffix = $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_chrono$secondaryArchSuffix == $portVersion " REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion " REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion - boost_chrono$secondaryArchSuffix = $portVersion - boost_date_time$secondaryArchSuffix = $portVersion - boost_filesystem$secondaryArchSuffix = $portVersion - boost_system$secondaryArchSuffix = $portVersion - boost_thread$secondaryArchSuffix = $portVersion + boost_chrono$secondaryArchSuffix == $portVersion + boost_date_time$secondaryArchSuffix == $portVersion + boost_filesystem$secondaryArchSuffix == $portVersion + boost_system$secondaryArchSuffix == $portVersion + boost_thread$secondaryArchSuffix == $portVersion " From 1cc9bfe6f60692ecfad837a495cde021b132f56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:10:38 +0000 Subject: [PATCH 04/12] TypeTraits patch --- dev-libs/boost/boost-1.55.0.recipe | 5 ++++- dev-libs/boost/patches/type_traits.patch | 26 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 dev-libs/boost/patches/type_traits.patch diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 0537980f5..d03754488 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -15,7 +15,10 @@ COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." ARCHITECTURES="?x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="boost_1_55_0" -PATCHES="boost-1.55.0.patch" +PATCHES=" + boost-1.55.0.patch + type_traits.patch +" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch new file mode 100644 index 000000000..a2c26785d --- /dev/null +++ b/dev-libs/boost/patches/type_traits.patch @@ -0,0 +1,26 @@ +diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp +index 1b15c7e..e953f00 100644 +--- a/boost/config/platform/haiku.hpp ++++ b/boost/config/platform/haiku.hpp +@@ -10,13 +10,21 @@ + #define BOOST_PLATFORM "Haiku" + + #define BOOST_NO_INTRINSIC_WCHAR_T ++#define BOOST_NO_STD_WSTRING + #define BOOST_HAS_UNISTD_H ++#define BOOST_EXCEPTION_DISABLE ++#define BOOST_NO_EXCEPTIONS ++#define BOOST_NO_AUTO_PTR ++#define GLIBC_HAVE_LONG_LONG + + #define BOOST_HAS_BETHREADS + + #ifndef BOOST_DISABLE_THREADS + # define BOOST_HAS_THREADS + #endif ++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS ++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR ++ + + // + // thread API's not auto detected: From 7040721b486f2448311fbea9a6520c595228d6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:24:34 +0000 Subject: [PATCH 05/12] Context package --- dev-libs/boost/boost-1.55.0.recipe | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d03754488..d132ceaaf 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -92,6 +92,7 @@ INSTALL() packageEntries devel $includeDir packageEntries atomic $libDir/*atomic* packageEntries chrono $libDir/*chrono* + packageEntries context $libDir/*context* packageEntries date_time $libDir/*date_time* packageEntries exception $libDir/*exception* packageEntries filesystem $libDir/*filesystem* @@ -121,6 +122,9 @@ PROVIDES_atomic=" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " +PROVIDES_context=" + boost_context$secondaryArchSuffix = $portVersion +" PROVIDES_date_time=" boost_date_time$secondaryArchSuffix = $portVersion " @@ -189,6 +193,10 @@ REQUIRES_chrono=" boost_system$secondaryArchSuffix == $portVersion " +REQUIRES_context=" + haiku$secondaryArchSuffix >= $haikuVersion +" + REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " From ad64fd97bcb9f9d8ad6b0727a7a413320b098a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:39:49 +0000 Subject: [PATCH 06/12] Pacthes modified --- dev-libs/boost/patches/type_traits.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index a2c26785d..e1c12c434 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,17 +1,14 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..e953f00 100644 +index 1b15c7e..c1b8e74 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -10,13 +10,21 @@ - #define BOOST_PLATFORM "Haiku" +@@ -11,12 +11,18 @@ #define BOOST_NO_INTRINSIC_WCHAR_T -+#define BOOST_NO_STD_WSTRING #define BOOST_HAS_UNISTD_H -+#define BOOST_EXCEPTION_DISABLE -+#define BOOST_NO_EXCEPTIONS +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG ++#define BOOST_HAS_STDINT_H #define BOOST_HAS_BETHREADS From 119fc87aec8b083ca29fd76b0f68006e81120871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 01:51:47 +0000 Subject: [PATCH 07/12] Try to fix boost::thread --- dev-libs/boost/patches/type_traits.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index e1c12c434..0da167cce 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,14 +1,15 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..c1b8e74 100644 +index 1b15c7e..a0bfb8c 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -11,12 +11,18 @@ +@@ -11,12 +11,19 @@ #define BOOST_NO_INTRINSIC_WCHAR_T #define BOOST_HAS_UNISTD_H +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H ++#define BOOST_NOT_STD_WSTRING #define BOOST_HAS_BETHREADS From 93aa86c4d351fff52a68f63a6232e93a69534bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:12:30 +0000 Subject: [PATCH 08/12] Pacthed finished --- dev-libs/boost/patches/type_traits.patch | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch index 0da167cce..02b4a07cb 100644 --- a/dev-libs/boost/patches/type_traits.patch +++ b/dev-libs/boost/patches/type_traits.patch @@ -1,15 +1,19 @@ diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp -index 1b15c7e..a0bfb8c 100644 +index 1b15c7e..9a3becd 100644 --- a/boost/config/platform/haiku.hpp +++ b/boost/config/platform/haiku.hpp -@@ -11,12 +11,19 @@ +@@ -9,18 +9,29 @@ - #define BOOST_NO_INTRINSIC_WCHAR_T + #define BOOST_PLATFORM "Haiku" + +-#define BOOST_NO_INTRINSIC_WCHAR_T ++//#define BOOST_NO_INTRINSIC_WCHAR_T #define BOOST_HAS_UNISTD_H +#define BOOST_NO_AUTO_PTR +#define GLIBC_HAVE_LONG_LONG +#define BOOST_HAS_STDINT_H -+#define BOOST_NOT_STD_WSTRING ++//#define BOOST_NOT_STD_WSTRING ++#define BOOST_HASH_NO_EXTENSIONS #define BOOST_HAS_BETHREADS @@ -18,7 +22,14 @@ index 1b15c7e..a0bfb8c 100644 #endif +#define BOOST_NO_CXX11_HDR_TYPE_TRAITS +#define BOOST_NO_CXX11_ATOMIC_SMART_PTR -+ ++#define BOOST_NO_CXX11_STATIC_ASSERT ++#define BOOST_NO_CXX11_VARIADIC_MACROS // // thread API's not auto detected: + // ++#define BOOST_HAS_SCHED_YIELD ++#define BOOST_HAS_PTHREAD_YIELD + #define BOOST_HAS_GETTIMEOFDAY + + // boilerplate code: From 6374b32d8efab0280a5dbbf9384d383d30d1dd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:19:24 +0000 Subject: [PATCH 09/12] Coroutine library --- dev-libs/boost/boost-1.55.0.recipe | 157 +++++++++++++---------------- 1 file changed, 72 insertions(+), 85 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d132ceaaf..a9663b525 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -93,6 +93,7 @@ INSTALL() packageEntries atomic $libDir/*atomic* packageEntries chrono $libDir/*chrono* packageEntries context $libDir/*context* + packageEntries coroutine $libDir/*coroutine* packageEntries date_time $libDir/*date_time* packageEntries exception $libDir/*exception* packageEntries filesystem $libDir/*filesystem* @@ -116,116 +117,80 @@ INSTALL() PROVIDES_devel=" boost_devel$secondaryArchSuffix = $portVersion " +REQUIRES_devel=" + haiku$secondaryArchSuffix >= $haikuVersion +" PROVIDES_atomic=" boost_atomic$secondaryArchSuffix = $portVersion " +REQUIRES_atomic=" + haiku$secondaryArchSuffix >= $haikuVersion +" PROVIDES_chrono=" boost_chrono$secondaryArchSuffix = $portVersion " -PROVIDES_context=" - boost_context$secondaryArchSuffix = $portVersion -" -PROVIDES_date_time=" - boost_date_time$secondaryArchSuffix = $portVersion -" -PROVIDES_exception=" - boost_exception$secondaryArchSuffix = $portVersion -" -PROVIDES_filesystem=" - boost_filesystem$secondaryArchSuffix = $portVersion -" -PROVIDES_graph=" - boost_graph$secondaryArchSuffix = $portVersion -" -PROVIDES_iostreams=" - boost_iostreams$secondaryArchSuffix = $portVersion -" -PROVIDES_locale=" - boost_locale$secondaryArchSuffix = $portVersion -" -PROVIDES_log=" - boost_log$secondaryArchSuffix = $portVersion -" -PROVIDES_math=" - boost_math$secondaryArchSuffix = $portVersion -" -PROVIDES_random=" - boost_random$secondaryArchSuffix = $portVersion -" -PROVIDES_program_options=" - boost_program_options$secondaryArchSuffix = $portVersion -" -PROVIDES_regex=" - boost_regex$secondaryArchSuffix = $portVersion -" -PROVIDES_serialization=" - boost_serialization$secondaryArchSuffix = $portVersion -" -PROVIDES_signals=" - boost_signals$secondaryArchSuffix = $portVersion -" -PROVIDES_system=" - boost_system$secondaryArchSuffix = $portVersion -" -PROVIDES_test=" - boost_test$secondaryArchSuffix = $portVersion -" -PROVIDES_thread=" - boost_thread$secondaryArchSuffix = $portVersion -" -PROVIDES_timer=" - boost_timer$secondaryArchSuffix = $portVersion -" -PROVIDES_wave=" - boost_wave$secondaryArchSuffix = $portVersion -" - -REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion - " - -REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion -" - REQUIRES_chrono=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion " - +PROVIDES_context=" + boost_context$secondaryArchSuffix = $portVersion +" REQUIRES_context=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_coroutine=" + boost_coroutine$secondaryArchSuffix = $portVersion +" +REQUIRES_coroutine=" + boost_context$secondaryArchSuffix == $portVersion +" +PROVIDES_date_time=" + boost_date_time$secondaryArchSuffix = $portVersion +" REQUIRES_date_time=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_exception=" + boost_exception$secondaryArchSuffix = $portVersion +" REQUIRES_exception=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_filesystem=" + boost_filesystem$secondaryArchSuffix = $portVersion +" REQUIRES_filesystem=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion + lib:libz$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix +" +PROVIDES_graph=" + boost_graph$secondaryArchSuffix = $portVersion " - REQUIRES_graph=" haiku$secondaryArchSuffix >= $haikuVersion boost_regex$secondaryArchSuffix == $portVersion " - +PROVIDES_iostreams=" + boost_iostreams$secondaryArchSuffix = $portVersion +" REQUIRES_iostreams=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_locale=" + boost_locale$secondaryArchSuffix = $portVersion +" REQUIRES_locale=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion " - +PROVIDES_log=" + boost_log$secondaryArchSuffix = $portVersion +" REQUIRES_log=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion @@ -233,51 +198,73 @@ REQUIRES_log=" boost_date_time$secondaryArchSuffix == $portVersion boost_thread$secondaryArchSuffix == $portVersion " - +PROVIDES_math=" + boost_math$secondaryArchSuffix = $portVersion +" REQUIRES_math=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_program_options=" + boost_program_options$secondaryArchSuffix = $portVersion +" REQUIRES_program_options=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_random=" + boost_random$secondaryArchSuffix = $portVersion +" REQUIRES_random=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_regex=" + boost_regex$secondaryArchSuffix = $portVersion +" REQUIRES_regex=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_serialization=" + boost_serialization$secondaryArchSuffix = $portVersion +" REQUIRES_serialization=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_signals=" + boost_signals$secondaryArchSuffix = $portVersion +" REQUIRES_signals=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_system=" + boost_system$secondaryArchSuffix = $portVersion +" REQUIRES_system=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_test=" + boost_test$secondaryArchSuffix = $portVersion +" REQUIRES_test=" haiku$secondaryArchSuffix >= $haikuVersion " - +PROVIDES_thread=" + boost_thread$secondaryArchSuffix = $portVersion +" REQUIRES_thread=" haiku$secondaryArchSuffix >= $haikuVersion boost_system$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion " - +PROVIDES_timer=" + boost_timer$secondaryArchSuffix = $portVersion +" REQUIRES_timer=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion boost_system$secondaryArchSuffix == $portVersion " - +PROVIDES_wave=" + boost_wave$secondaryArchSuffix = $portVersion +" REQUIRES_wave=" haiku$secondaryArchSuffix >= $haikuVersion boost_chrono$secondaryArchSuffix == $portVersion From 62cbcc8576cefa1b35f0ba4acd736477133fec4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 19 Dec 2013 06:49:26 +0000 Subject: [PATCH 10/12] Boost installation --- dev-libs/boost/boost-1.55.0.recipe | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index a9663b525..db56d6e75 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -33,6 +33,8 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:jam cmd:iconv + cmd:make + binutils " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -79,15 +81,21 @@ BUILD() INSTALL() { - ./bjam install \ - -d2 \ - --prefix=$prefix \ - --exec-prefix=$binDir \ - --libdir=$libDir \ - --includedir=$includeDir \ - inlining=on \ - --without-mpi \ - --without-python + #./bjam install \ + # -d2 \ + # --prefix=$prefix \ + # --exec-prefix=$binDir \ + # --libdir=$libDir \ + # --includedir=$includeDir \ + # inlining=on \ + # --without-mpi \ + # --without-python \ + # --disable-icu + mkdir -p $includeDir + mkdir -p $libDir + + cp -rf boost $includeDir + cp stage/lib/* $libDir packageEntries devel $includeDir packageEntries atomic $libDir/*atomic* From 67d6b061f151855f96c7b5e8ae1933466c47b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 20 Dec 2013 18:38:59 +0000 Subject: [PATCH 11/12] Removed comments --- dev-libs/boost/boost-1.55.0.recipe | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index db56d6e75..74d270f35 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -19,7 +19,6 @@ PATCHES=" boost-1.55.0.patch type_traits.patch " -DISABLE_SOURCE_PACKAGE=yes PROVIDES=" lib:boost = 1.55.0 @@ -81,16 +80,6 @@ BUILD() INSTALL() { - #./bjam install \ - # -d2 \ - # --prefix=$prefix \ - # --exec-prefix=$binDir \ - # --libdir=$libDir \ - # --includedir=$includeDir \ - # inlining=on \ - # --without-mpi \ - # --without-python \ - # --disable-icu mkdir -p $includeDir mkdir -p $libDir From ba7b6295bddfe671568675f0caebeaaa6ef2a637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 20 Dec 2013 21:07:30 +0000 Subject: [PATCH 12/12] Changed architectures --- dev-libs/boost/boost-1.55.0.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 74d270f35..b1a2daff6 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -12,8 +12,11 @@ CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354" REVISION="1" LICENSE="Boost v1.0" COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." -ARCHITECTURES="?x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86 ?x86_64" SOURCE_DIR="boost_1_55_0" PATCHES=" boost-1.55.0.patch