Date: Sunday, February 12, 2023 @ 08:41:31 Author: foutrelis Revision: 1399930
archrelease: copy trunk to multilib-x86_64 Added: lib32-boost/repos/multilib-x86_64/PKGBUILD (from rev 1399929, lib32-boost/trunk/PKGBUILD) lib32-boost/repos/multilib-x86_64/boost-1.78.0-no_cmake_native.patch (from rev 1399929, lib32-boost/trunk/boost-1.78.0-no_cmake_native.patch) lib32-boost/repos/multilib-x86_64/boost-1.81.0-phoenix-multiple-definitions.patch (from rev 1399929, lib32-boost/trunk/boost-1.81.0-phoenix-multiple-definitions.patch) Deleted: lib32-boost/repos/multilib-x86_64/PKGBUILD lib32-boost/repos/multilib-x86_64/boost-1.78.0-no_cmake_native.patch lib32-boost/repos/multilib-x86_64/boost-1.81.0-phoenix-multiple-definitions.patch -------------------------------------------------+ PKGBUILD | 284 +++++++++++----------- boost-1.78.0-no_cmake_native.patch | 58 ++-- boost-1.81.0-phoenix-multiple-definitions.patch | 22 - 3 files changed, 182 insertions(+), 182 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2023-02-12 08:41:20 UTC (rev 1399929) +++ PKGBUILD 2023-02-12 08:41:31 UTC (rev 1399930) @@ -1,142 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> - -_name=boost -pkgbase=lib32-boost -pkgname=(lib32-boost lib32-boost-libs) -pkgver=1.81.0 -_srcname=${_name}_${pkgver//./_} -pkgrel=2 -pkgdesc="Free peer-reviewed portable C++ source libraries - 32bit" -arch=(x86_64) -url="https://www.boost.org/" -license=(Boost) -# NOTE: needs lib32-openmpi for (optional) mpi and graph_parallel support -# NOTE: needs lib32-python for (optional) python support -makedepends=("boost=${pkgver}" lib32-bzip2 lib32-icu lib32-xz lib32-zlib lib32-zstd) -source=( - "https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2" - "${_name}-1.78.0-no_cmake_native.patch" - "${_name}-1.81.0-phoenix-multiple-definitions.patch" - "${_name}-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch" -) -sha512sums=('a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36' - '364387300b9846337d3b8a87ecf677943ab37f7784c74616aaeb1c5ce688b12b6f51516b17c321375eb3ab0319fc206ae8be4a457ec145d69b15d0b8ad62d198' - '6e4f012158ac8ee81a783ab0a937bc127dbed4ae96882128ef802ca866cfea98018a4287a139e06d8918004b9e8fc3a31181da14b4c2dd1bf19c8f64cecb049a' - '1b9b2d8a4a1c290d30fb9fb340ea6b222a37424ddd461e0f2c869fba424b41fb8ebc612303fb6427a31939c8813e14fe086e188ea2168f3f9c43d43beea4ffa5') -b2sums=('ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7' - '468d07f48cfa4a1b39724baf66b96cfc4b580eff5231704c5977919e8683c69aeda8759c39b898b8f2e554342bb855912efbe05dd21fc04b898921847056dcf4' - 'd9bae6f053188f936ef45b521ff0fd3ed91cbb9fb90d74d94ac55844213de82f0c8b075796e19cf9e14d840add3154c66e9ccb2b5dcd88e71fee7505d547c4c8' - 'e5f6d4884eaa557d5547e7e079c2edb4ed9f2f4cd8579aa32a2150f824a5d04413f2a91e79b3139d5b915da6a46f7835f1438ad53f33096973f1a99f378ec1d3') - -_pick() { - local p="$1" f d; shift - for f; do - d="$srcdir/$p/${f#$pkgdir/}" - mkdir -p "$(dirname "$d")" - mv "$f" "$d" - rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" - done -} - -prepare() { - local _tmp_install_dir="${srcdir}/tmp_install" - cd $_srcname - - # https://github.com/boostorg/ublas/pull/97 - patch -Np2 -i ../${_name}-ublas-c++20-iterator.patch - # remove unneeded cmake checks, that would relate to the build dir - patch -Np1 -i ../"${_name}-1.78.0-no_cmake_native.patch" - # https://github.com/boostorg/phoenix/issues/111 - patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch - - mkdir -vp "${_tmp_install_dir}" -} - -build() { - local _tmp_install_dir="${srcdir}/tmp_install" - local _jobs="$(sed 's/.*\(-j *[0-9]\+\).*/\1/' <<<$MAKEFLAGS)" - - # bootstrap build tooling - ( - cd $_srcname/tools/build - ./bootstrap.sh --cxxflags="$CXXFLAGS $LDFLAGS" - ) - - export CFLAGS+=' -m32' - export CXXFLAGS+=' -m32' - export LDFLAGS+=' -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - - cd $_srcname - ./bootstrap.sh \ - --includedir=include \ - --libdir=lib32 \ - --with-icu \ - --with-python= \ - --with-toolset=gcc - - ./b2 install \ - address-model=32 \ - cflags="$CPPFLAGS $CFLAGS -ffat-lto-objects -fPIC -O3" \ - cxxflags="$CPPFLAGS $CXXFLAGS -ffat-lto-objects -fPIC -O3" \ - debug-symbols=off \ - linkflags="$LDFLAGS" \ - link=shared,static \ - runtime-link=shared \ - threading=multi \ - toolset=gcc \ - variant=release \ - $_jobs \ - --includedir="${_tmp_install_dir}/usr/include" \ - --layout=system \ - --libdir="${_tmp_install_dir}/usr/lib32" \ - --prefix="${_tmp_install_dir}" \ - --without-mpi \ - --without-graph_parallel \ - --without-python - - ( - cd "${_tmp_install_dir}" - _pick boost-libs usr/lib32/*.so.* - _pick headers usr/include - ) -} - -package_lib32-boost() { - local _tmp_install_dir="${srcdir}/tmp_install" - - depends=("boost=${pkgver}" "lib32-boost-libs=${pkgver}") - options=('staticlibs') - - mv -v "${_tmp_install_dir}/"* "${pkgdir}/" -} - -package_lib32-boost-libs() { - local _tmp_install_dir="${srcdir}/tmp_install" - - pkgdesc+=" (runtime libraries)" - depends=( - lib32-bzip2 - lib32-gcc-libs - lib32-glibc - lib32-icu libicuuc.so libicui18n.so libicudata.so - lib32-xz liblzma.so - lib32-zlib libz.so - lib32-zstd libzstd.so - ) - provides=(libboost_atomic.so libboost_chrono.so libboost_container.so - libboost_context.so libboost_contract.so libboost_coroutine.so - libboost_date_time.so libboost_fiber.so libboost_filesystem.so - libboost_graph.so libboost_iostreams.so libboost_json.so libboost_locale.so - libboost_log.so libboost_log_setup.so libboost_math_c99.so - libboost_math_c99f.so libboost_math_c99l.so libboost_math_tr1.so - libboost_math_tr1f.so libboost_math_tr1l.so libboost_prg_exec_monitor.so - libboost_program_options.so libboost_random.so libboost_regex.so - libboost_serialization.so libboost_stacktrace_addr2line.so - libboost_stacktrace_basic.so libboost_stacktrace_noop.so libboost_system.so - libboost_thread.so libboost_timer.so libboost_type_erasure.so - libboost_unit_test_framework.so libboost_url.so libboost_wave.so - libboost_wserialization.so) - - mv -v boost-libs/* "${pkgdir}/" -} Copied: lib32-boost/repos/multilib-x86_64/PKGBUILD (from rev 1399929, lib32-boost/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2023-02-12 08:41:31 UTC (rev 1399930) @@ -0,0 +1,142 @@ +# Maintainer: David Runge <dv...@archlinux.org> + +_name=boost +pkgbase=lib32-boost +pkgname=(lib32-boost lib32-boost-libs) +pkgver=1.81.0 +_srcname=${_name}_${pkgver//./_} +pkgrel=3 +pkgdesc="Free peer-reviewed portable C++ source libraries - 32bit" +arch=(x86_64) +url="https://www.boost.org/" +license=(Boost) +# NOTE: needs lib32-openmpi for (optional) mpi and graph_parallel support +# NOTE: needs lib32-python for (optional) python support +makedepends=("boost=${pkgver}" lib32-bzip2 lib32-icu lib32-xz lib32-zlib lib32-zstd) +source=( + "https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2" + "${_name}-1.78.0-no_cmake_native.patch" + "${_name}-1.81.0-phoenix-multiple-definitions.patch" + "${_name}-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch" +) +sha512sums=('a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36' + '364387300b9846337d3b8a87ecf677943ab37f7784c74616aaeb1c5ce688b12b6f51516b17c321375eb3ab0319fc206ae8be4a457ec145d69b15d0b8ad62d198' + '6e4f012158ac8ee81a783ab0a937bc127dbed4ae96882128ef802ca866cfea98018a4287a139e06d8918004b9e8fc3a31181da14b4c2dd1bf19c8f64cecb049a' + '1b9b2d8a4a1c290d30fb9fb340ea6b222a37424ddd461e0f2c869fba424b41fb8ebc612303fb6427a31939c8813e14fe086e188ea2168f3f9c43d43beea4ffa5') +b2sums=('ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7' + '468d07f48cfa4a1b39724baf66b96cfc4b580eff5231704c5977919e8683c69aeda8759c39b898b8f2e554342bb855912efbe05dd21fc04b898921847056dcf4' + 'd9bae6f053188f936ef45b521ff0fd3ed91cbb9fb90d74d94ac55844213de82f0c8b075796e19cf9e14d840add3154c66e9ccb2b5dcd88e71fee7505d547c4c8' + 'e5f6d4884eaa557d5547e7e079c2edb4ed9f2f4cd8579aa32a2150f824a5d04413f2a91e79b3139d5b915da6a46f7835f1438ad53f33096973f1a99f378ec1d3') + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +prepare() { + local _tmp_install_dir="${srcdir}/tmp_install" + cd $_srcname + + # https://github.com/boostorg/ublas/pull/97 + patch -Np2 -i ../${_name}-ublas-c++20-iterator.patch + # remove unneeded cmake checks, that would relate to the build dir + patch -Np1 -i ../"${_name}-1.78.0-no_cmake_native.patch" + # https://github.com/boostorg/phoenix/issues/111 + patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch + + mkdir -vp "${_tmp_install_dir}" +} + +build() { + local _tmp_install_dir="${srcdir}/tmp_install" + local _jobs="$(sed 's/.*\(-j *[0-9]\+\).*/\1/' <<<$MAKEFLAGS)" + + # bootstrap build tooling + ( + cd $_srcname/tools/build + ./bootstrap.sh --cxxflags="$CXXFLAGS $LDFLAGS" + ) + + export CFLAGS+=' -m32' + export CXXFLAGS+=' -m32' + export LDFLAGS+=' -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + + cd $_srcname + ./bootstrap.sh \ + --includedir=include \ + --libdir=lib32 \ + --with-icu \ + --with-python= \ + --with-toolset=gcc + + ./b2 install \ + address-model=32 \ + cflags="$CPPFLAGS $CFLAGS -ffat-lto-objects -fPIC -O3" \ + cxxflags="$CPPFLAGS $CXXFLAGS -ffat-lto-objects -fPIC -O3" \ + debug-symbols=off \ + linkflags="$LDFLAGS" \ + link=shared,static \ + runtime-link=shared \ + threading=multi \ + toolset=gcc \ + variant=release \ + $_jobs \ + --includedir="${_tmp_install_dir}/usr/include" \ + --layout=system \ + --libdir="${_tmp_install_dir}/usr/lib32" \ + --prefix="${_tmp_install_dir}" \ + --without-mpi \ + --without-graph_parallel \ + --without-python + + ( + cd "${_tmp_install_dir}" + _pick boost-libs usr/lib32/*.so.* + _pick headers usr/include + ) +} + +package_lib32-boost() { + local _tmp_install_dir="${srcdir}/tmp_install" + + depends=("boost=${pkgver}" "lib32-boost-libs=${pkgver}") + options=('staticlibs') + + mv -v "${_tmp_install_dir}/"* "${pkgdir}/" +} + +package_lib32-boost-libs() { + local _tmp_install_dir="${srcdir}/tmp_install" + + pkgdesc+=" (runtime libraries)" + depends=( + lib32-bzip2 + lib32-gcc-libs + lib32-glibc + lib32-icu libicuuc.so libicui18n.so libicudata.so + lib32-xz liblzma.so + lib32-zlib libz.so + lib32-zstd libzstd.so + ) + provides=(libboost_atomic.so libboost_chrono.so libboost_container.so + libboost_context.so libboost_contract.so libboost_coroutine.so + libboost_date_time.so libboost_fiber.so libboost_filesystem.so + libboost_graph.so libboost_iostreams.so libboost_json.so libboost_locale.so + libboost_log.so libboost_log_setup.so libboost_math_c99.so + libboost_math_c99f.so libboost_math_c99l.so libboost_math_tr1.so + libboost_math_tr1f.so libboost_math_tr1l.so libboost_nowide.so + libboost_prg_exec_monitor.so libboost_program_options.so libboost_random.so + libboost_regex.so libboost_serialization.so libboost_stacktrace_addr2line.so + libboost_stacktrace_basic.so libboost_stacktrace_noop.so libboost_system.so + libboost_thread.so libboost_timer.so libboost_type_erasure.so + libboost_unit_test_framework.so libboost_url.so libboost_wave.so + libboost_wserialization.so) + + mv -v boost-libs/* "${pkgdir}/" +} Deleted: boost-1.78.0-no_cmake_native.patch =================================================================== --- boost-1.78.0-no_cmake_native.patch 2023-02-12 08:41:20 UTC (rev 1399929) +++ boost-1.78.0-no_cmake_native.patch 2023-02-12 08:41:31 UTC (rev 1399930) @@ -1,29 +0,0 @@ -diff -ruN a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam ---- a/tools/boost_install/boost-install.jam 2021-12-02 07:47:38.000000000 +0100 -+++ b/tools/boost_install/boost-install.jam 2021-12-20 10:36:34.058660030 +0100 -@@ -711,25 +711,6 @@ - "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" - : true ; - -- if [ path.is-rooted $(cmakedir) ] -- { -- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ; -- -- print.text -- -- "" -- "# If the computed and the original directories are symlink-equivalent, use original" -- "if(EXISTS \"$(cmakedir-native)\")" -- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)" -- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)" -- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")" -- " endif()" -- " unset(_BOOST_CMAKEDIR_ORIGINAL)" -- "endif()" -- "" -- : true ; -- } -- - get-dir "_BOOST_INCLUDEDIR" : $(includedir) ; - - if $(library-type) = INTERFACE Copied: lib32-boost/repos/multilib-x86_64/boost-1.78.0-no_cmake_native.patch (from rev 1399929, lib32-boost/trunk/boost-1.78.0-no_cmake_native.patch) =================================================================== --- boost-1.78.0-no_cmake_native.patch (rev 0) +++ boost-1.78.0-no_cmake_native.patch 2023-02-12 08:41:31 UTC (rev 1399930) @@ -0,0 +1,29 @@ +diff -ruN a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam +--- a/tools/boost_install/boost-install.jam 2021-12-02 07:47:38.000000000 +0100 ++++ b/tools/boost_install/boost-install.jam 2021-12-20 10:36:34.058660030 +0100 +@@ -711,25 +711,6 @@ + "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)" + : true ; + +- if [ path.is-rooted $(cmakedir) ] +- { +- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ; +- +- print.text +- +- "" +- "# If the computed and the original directories are symlink-equivalent, use original" +- "if(EXISTS \"$(cmakedir-native)\")" +- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)" +- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)" +- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")" +- " endif()" +- " unset(_BOOST_CMAKEDIR_ORIGINAL)" +- "endif()" +- "" +- : true ; +- } +- + get-dir "_BOOST_INCLUDEDIR" : $(includedir) ; + + if $(library-type) = INTERFACE Deleted: boost-1.81.0-phoenix-multiple-definitions.patch =================================================================== --- boost-1.81.0-phoenix-multiple-definitions.patch 2023-02-12 08:41:20 UTC (rev 1399929) +++ boost-1.81.0-phoenix-multiple-definitions.patch 2023-02-12 08:41:31 UTC (rev 1399930) @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/887041 -https://github.com/boostorg/phoenix/issues/111 ---- a/boost/phoenix/stl.hpp -+++ b/boost/phoenix/stl.hpp -@@ -11,6 +11,5 @@ - - #include <boost/phoenix/stl/algorithm.hpp> - #include <boost/phoenix/stl/container.hpp> --#include <boost/phoenix/stl/tuple.hpp> - - #endif Copied: lib32-boost/repos/multilib-x86_64/boost-1.81.0-phoenix-multiple-definitions.patch (from rev 1399929, lib32-boost/trunk/boost-1.81.0-phoenix-multiple-definitions.patch) =================================================================== --- boost-1.81.0-phoenix-multiple-definitions.patch (rev 0) +++ boost-1.81.0-phoenix-multiple-definitions.patch 2023-02-12 08:41:31 UTC (rev 1399930) @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/887041 +https://github.com/boostorg/phoenix/issues/111 +--- a/boost/phoenix/stl.hpp ++++ b/boost/phoenix/stl.hpp +@@ -11,6 +11,5 @@ + + #include <boost/phoenix/stl/algorithm.hpp> + #include <boost/phoenix/stl/container.hpp> +-#include <boost/phoenix/stl/tuple.hpp> + + #endif