From ed4dcba9a7e96346fd033c4551a528c5d2e2e5f7 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Fri, 18 Mar 2022 15:28:37 +0200 Subject: [PATCH 1/2] boost: update to 1.79.0.b1. --- common/shlibs | 60 ++++---- .../{boost-python1.72 => boost-python1.79} | 0 ...{boost-python3-1.72 => boost-python3-1.79} | 0 srcpkgs/boost/patches/exec_file.patch | 45 ------ srcpkgs/boost/patches/mips.patch | 2 +- srcpkgs/boost/template | 144 +++++++----------- ...ibboost_atomic1.72 => libboost_atomic1.79} | 0 ...ibboost_chrono1.72 => libboost_chrono1.79} | 0 ...t_container1.72 => libboost_container1.79} | 0 ...boost_context1.72 => libboost_context1.79} | 0 ...ost_contract1.72 => libboost_contract1.79} | 0 ...t_coroutine1.72 => libboost_coroutine1.79} | 0 ...t_date_time1.72 => libboost_date_time1.79} | 0 ...oost_fiber1.72 => libboost_filesystem1.79} | 0 ...oost_filesystem1.72 => libboost_graph1.79} | 0 ...boost_graph1.72 => libboost_iostreams1.79} | 0 ...oost_iostreams1.72 => libboost_locale1.79} | 0 .../{libboost_locale1.72 => libboost_log1.79} | 0 ...ibboost_log1.72 => libboost_log_setup1.79} | 0 ...st_log_setup1.72 => libboost_math_c991.79} | 0 ...st_math_c991.72 => libboost_math_c99f1.79} | 0 ...t_math_c99f1.72 => libboost_math_c99l1.79} | 0 ...st_math_c99l1.72 => libboost_math_tr11.79} | 0 ...st_math_tr11.72 => libboost_math_tr1f1.79} | 0 ...t_math_tr1f1.72 => libboost_math_tr1l1.79} | 0 ...tr1l1.72 => libboost_prg_exec_monitor1.79} | 0 ...nitor1.72 => libboost_program_options1.79} | 0 ...rogram_options1.72 => libboost_random1.79} | 0 ...libboost_random1.72 => libboost_regex1.79} | 0 ...t_regex1.72 => libboost_serialization1.79} | 0 ..._serialization1.72 => libboost_system1.79} | 0 ...race_addr2line1.72 => libboost_thread1.79} | 0 ...tacktrace_basic1.72 => libboost_timer1.79} | 0 srcpkgs/libboost_type_erasure1.72 | 1 - ...ace_noop1.72 => libboost_type_erasure1.79} | 0 srcpkgs/libboost_unit_test_framework1.72 | 1 - ...m1.72 => libboost_unit_test_framework1.79} | 0 srcpkgs/libboost_wave1.72 | 1 - ...{libboost_thread1.72 => libboost_wave1.79} | 0 srcpkgs/libboost_wserialization1.72 | 1 - ..._timer1.72 => libboost_wserialization1.79} | 0 41 files changed, 81 insertions(+), 174 deletions(-) rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%) rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%) delete mode 100644 srcpkgs/boost/patches/exec_file.patch rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%) rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%) rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%) rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%) rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%) rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%) rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%) rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%) rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%) rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%) rename srcpkgs/{libboost_iostreams1.72 => libboost_locale1.79} (100%) rename srcpkgs/{libboost_locale1.72 => libboost_log1.79} (100%) rename srcpkgs/{libboost_log1.72 => libboost_log_setup1.79} (100%) rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c991.79} (100%) rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f1.79} (100%) rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l1.79} (100%) rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr11.79} (100%) rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f1.79} (100%) rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l1.79} (100%) rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor1.79} (100%) rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options1.79} (100%) rename srcpkgs/{libboost_program_options1.72 => libboost_random1.79} (100%) rename srcpkgs/{libboost_random1.72 => libboost_regex1.79} (100%) rename srcpkgs/{libboost_regex1.72 => libboost_serialization1.79} (100%) rename srcpkgs/{libboost_serialization1.72 => libboost_system1.79} (100%) rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread1.79} (100%) rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer1.79} (100%) delete mode 120000 srcpkgs/libboost_type_erasure1.72 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure1.79} (100%) delete mode 120000 srcpkgs/libboost_unit_test_framework1.72 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework1.79} (100%) delete mode 120000 srcpkgs/libboost_wave1.72 rename srcpkgs/{libboost_thread1.72 => libboost_wave1.79} (100%) delete mode 120000 srcpkgs/libboost_wserialization1.72 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization1.79} (100%) diff --git a/common/shlibs b/common/shlibs index 83b5783cb026..9bc15791e719 100644 --- a/common/shlibs +++ b/common/shlibs @@ -620,38 +620,34 @@ libip4tc.so.2 iptables-1.8.3_1 libipq.so.0 iptables-1.4.7_1 libnm.so.0 libnm-1.0.0_1 libKF5ItemModels.so.5 kitemmodels-5.26.0_1 -libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1 -libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1 -libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1 -libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1 -libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1 -libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1 -libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1 -libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1 -libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1 -libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1 -libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1 -libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1 -libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1 -libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1 -libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1 -libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1 -libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1 -libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1 -libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1 -libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1 -libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1 -libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1 -libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1 -libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1 -libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1 -libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1 -libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1 -libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1 -libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1 -libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1 -libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1 -libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6 +libboost_context.so.1.79.0 libboost_context1.79-1.79.0.b1_1 +libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1 +libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1 +libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1 +libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1 +libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1 +libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1 +libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1 +libboost_math_c99.so.1.79.0 libboost_math_c991.79-1.79.0.b1_1 +libboost_math_tr1.so.1.79.0 libboost_math_tr11.79-1.79.0.b1_1 +libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1 +libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1 +libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1 +libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1 +libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1 +libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1 +libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1 +libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1 +libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1 +libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1 +libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1 +libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1 +libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1 +libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1 +libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1 +libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1 +libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1 +libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1 libexempi.so.8 exempi-2.5.0_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2-1.45.so.2 libsgutils-1.45_1 diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python1.79 similarity index 100% rename from srcpkgs/boost-python1.72 rename to srcpkgs/boost-python1.79 diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79 similarity index 100% rename from srcpkgs/boost-python3-1.72 rename to srcpkgs/boost-python3-1.79 diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch deleted file mode 100644 index b1b0ef969c4d..000000000000 --- a/srcpkgs/boost/patches/exec_file.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001 -From: Pat Riehecky -Date: Mon, 29 Jun 2020 10:51:58 -0500 -Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames - - [ - Ed.: Paths were adapted from upstream commit - https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410 - ] - ---- - src/exec.cpp | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp -index 171c6f4189..b2eabe59f6 100644 ---- a/libs/python/src/exec.cpp -+++ b/libs/python/src/exec.cpp -@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l - if (local.is_none()) local = global; - // should be 'char const *' but older python versions don't use 'const' yet. - char *f = const_cast(filename); -- // Let python open the file to avoid potential binary incompatibilities. --#if PY_VERSION_HEX >= 0x03040000 -- FILE *fs = _Py_fopen(f, "r"); -+#if PY_VERSION_HEX >= 0x03010000 -+ // Let python manage any UTF bits to avoid potential incompatibilities. -+ PyObject *fo = Py_BuildValue("s", f); -+ PyObject *fb = Py_None; -+ PyUnicode_FSConverter(fo, &fb); -+ f = PyBytes_AsString(fb); -+ FILE *fs = fopen(f, "r"); -+ Py_DECREF(fo); -+ Py_DECREF(fb); - #elif PY_VERSION_HEX >= 0x03000000 -+ // Let python open the file to avoid potential binary incompatibilities. - PyObject *fo = Py_BuildValue("s", f); -- FILE *fs = _Py_fopen(fo, "r"); -+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API - Py_DECREF(fo); - #else -+ // Let python open the file to avoid potential binary incompatibilities. - PyObject *pyfile = PyFile_FromString(f, const_cast("r")); - if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file"); - python::handle<> file(pyfile); diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch index a10a2122d9c7..8d253fc7c286 100644 --- a/srcpkgs/boost/patches/mips.patch +++ b/srcpkgs/boost/patches/mips.patch @@ -3,7 +3,7 @@ @@ -48,7 +48,7 @@ # define cpu_relax() asm volatile ("nop" ::: "memory"); # endif - #elif BOOST_ARCH_MIPS + #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2) && defined(__mips64))) -# define cpu_relax() asm volatile ("pause" ::: "memory"); +# define cpu_relax() asm volatile ("nop" ::: "memory"); #elif BOOST_ARCH_PPC diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 126c50770b50..f8100f1cb3c2 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,16 +1,17 @@ # Template file for 'boost' pkgname=boost -version=1.72.0 -revision=7 -wrksrc="${pkgname}_${version//\./_}" +version=1.79.0.b1 +revision=1 +wrksrc="${pkgname}_${version%.*}" +wrksrc="${wrksrc//\./_}" hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel" makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel" short_desc="Free peer-reviewed portable C++ source libraries" maintainer="John " license="BSL-1.0" homepage="http://www.boost.org/" -distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2" -checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 +distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2" +checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf python_version=3 CXXFLAGS="-std=c++14" @@ -31,25 +32,6 @@ replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0 libboost_wserialization1.69>=0 libboost_context1.69>=0 libboost_stacktrace_addr2line1.69>=0" -subpackages="libboost_program_options1.72 libboost_math_c99f1.72 - libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72 - libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72 - libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72 - libboost_graph1.72 libboost_locale1.72 libboost_regex1.72 - libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72 - libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72 - boost-python3-1.72 libboost_log_setup1.72 boost-devel - libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72 - libboost_serialization1.72 libboost_math_tr11.72 boost-build - libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72 - libboost_date_time1.72 libboost_log1.72 libboost_random1.72 - libboost_thread1.72 libboost_container1.72 boost-jam - libboost_wserialization1.72 libboost_context1.72" - -if [ -z "$CROSS_BUILD" ]; then - subpackages+=" libboost_stacktrace_addr2line1.72" -fi - case "$XBPS_TARGET_MACHINE" in i686*) _arch=x86; _abi=sysv ;; x86_64*) _arch=x86; _abi=sysv ;; @@ -74,10 +56,8 @@ do_build() { using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ; __EOF - # --no-cmake-config should be removed with boost-1.71 or later ./b2 ${makejobs} \ --user-config=${wrksrc}/user-config.jam --debug-building \ - --no-cmake-config \ --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \ threading=multi runtime-link=shared link=shared,static } @@ -119,7 +99,7 @@ boost-jam_package() { vmove usr/bin/b2 } } -boost-python1.72_package() { +boost-python1.79_package() { depends="boost python" replaces="boost-python>=0" short_desc+=" - Python bindings" @@ -127,7 +107,7 @@ boost-python1.72_package() { vmove "usr/lib/libboost_python2*.so.*" } } -boost-python3-1.72_package() { +boost-python3-1.79_package() { depends="boost python3" replaces="boost-python3>=0" short_desc+=" - Python3 bindings" @@ -145,7 +125,19 @@ boost-build_package() { } boost-devel_package() { noverifyrdeps=yes - depends="boost ${subpackages/boost-devel}" + depends="boost libboost_program_options1.79 libboost_math_c99f1.79 + libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79 + libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79 + libboost_graph1.79 libboost_locale1.79 libboost_regex1.79 + libboost_type_erasure1.79 libboost_coroutine1.79 + libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c991.79 + boost-python3-1.79 libboost_log_setup1.79 + libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79 + libboost_serialization1.79 libboost_math_tr11.79 boost-build + libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79 + libboost_date_time1.79 libboost_log1.79 libboost_random1.79 + libboost_thread1.79 libboost_container1.79 boost-jam + libboost_wserialization1.79 libboost_context1.79" short_desc+=" - development files" pkg_install() { vmove usr/include @@ -154,7 +146,7 @@ boost-devel_package() { } } -libboost_atomic1.72_package() { +libboost_atomic1.79_package() { depends="boost" short_desc+=" - libboost_atomic" pkg_install() { @@ -162,7 +154,7 @@ libboost_atomic1.72_package() { } } -libboost_chrono1.72_package() { +libboost_chrono1.79_package() { depends="boost" short_desc+=" - libboost_chrono" pkg_install() { @@ -170,7 +162,7 @@ libboost_chrono1.72_package() { } } -libboost_container1.72_package() { +libboost_container1.79_package() { depends="boost" short_desc+=" - libboost_container" pkg_install() { @@ -178,7 +170,7 @@ libboost_container1.72_package() { } } -libboost_context1.72_package() { +libboost_context1.79_package() { depends="boost" short_desc+=" - libboost_context" pkg_install() { @@ -186,7 +178,7 @@ libboost_context1.72_package() { } } -libboost_contract1.72_package() { +libboost_contract1.79_package() { depends="boost" short_desc+=" - libboost_contract" pkg_install() { @@ -194,7 +186,7 @@ libboost_contract1.72_package() { } } -libboost_coroutine1.72_package() { +libboost_coroutine1.79_package() { depends="boost" short_desc+=" - libboost_coroutine" pkg_install() { @@ -202,7 +194,7 @@ libboost_coroutine1.72_package() { } } -libboost_date_time1.72_package() { +libboost_date_time1.79_package() { depends="boost" short_desc+=" - libboost_date_time" pkg_install() { @@ -210,15 +202,7 @@ libboost_date_time1.72_package() { } } -libboost_fiber1.72_package() { - depends="boost" - short_desc+=" - libboost_fiber" - pkg_install() { - vmove usr/lib/libboost_fiber.so.* - } -} - -libboost_filesystem1.72_package() { +libboost_filesystem1.79_package() { depends="boost" short_desc+=" - libboost_filesystem" pkg_install() { @@ -226,7 +210,7 @@ libboost_filesystem1.72_package() { } } -libboost_graph1.72_package() { +libboost_graph1.79_package() { depends="boost" short_desc+=" - libboost_graph" pkg_install() { @@ -234,7 +218,7 @@ libboost_graph1.72_package() { } } -libboost_iostreams1.72_package() { +libboost_iostreams1.79_package() { depends="boost" short_desc+=" - libboost_iostreams" pkg_install() { @@ -242,7 +226,7 @@ libboost_iostreams1.72_package() { } } -libboost_locale1.72_package() { +libboost_locale1.79_package() { depends="boost" short_desc+=" - libboost_locale" pkg_install() { @@ -250,7 +234,7 @@ libboost_locale1.72_package() { } } -libboost_log1.72_package() { +libboost_log1.79_package() { depends="boost" short_desc+=" - libboost_log" pkg_install() { @@ -258,7 +242,7 @@ libboost_log1.72_package() { } } -libboost_log_setup1.72_package() { +libboost_log_setup1.79_package() { depends="boost" short_desc+=" - libboost_log_setup" pkg_install() { @@ -266,7 +250,7 @@ libboost_log_setup1.72_package() { } } -libboost_math_c991.72_package() { +libboost_math_c991.79_package() { depends="boost" short_desc+=" - libboost_math_c99" pkg_install() { @@ -274,7 +258,7 @@ libboost_math_c991.72_package() { } } -libboost_math_c99f1.72_package() { +libboost_math_c99f1.79_package() { depends="boost" short_desc+=" - libboost_math_c99f" pkg_install() { @@ -282,7 +266,7 @@ libboost_math_c99f1.72_package() { } } -libboost_math_c99l1.72_package() { +libboost_math_c99l1.79_package() { depends="boost" short_desc+=" - libboost_math_c99l" pkg_install() { @@ -290,7 +274,7 @@ libboost_math_c99l1.72_package() { } } -libboost_math_tr11.72_package() { +libboost_math_tr11.79_package() { depends="boost" short_desc+=" - libboost_math_tr1" pkg_install() { @@ -298,7 +282,7 @@ libboost_math_tr11.72_package() { } } -libboost_math_tr1f1.72_package() { +libboost_math_tr1f1.79_package() { depends="boost" short_desc+=" - libboost_math_tr1f" pkg_install() { @@ -306,7 +290,7 @@ libboost_math_tr1f1.72_package() { } } -libboost_math_tr1l1.72_package() { +libboost_math_tr1l1.79_package() { depends="boost" short_desc+=" - libboost_math_tr1l" pkg_install() { @@ -314,7 +298,7 @@ libboost_math_tr1l1.72_package() { } } -libboost_prg_exec_monitor1.72_package() { +libboost_prg_exec_monitor1.79_package() { depends="boost" short_desc+=" - libboost_prg_exec_monitor" pkg_install() { @@ -322,7 +306,7 @@ libboost_prg_exec_monitor1.72_package() { } } -libboost_program_options1.72_package() { +libboost_program_options1.79_package() { depends="boost" short_desc+=" - libboost_program_options" pkg_install() { @@ -330,7 +314,7 @@ libboost_program_options1.72_package() { } } -libboost_random1.72_package() { +libboost_random1.79_package() { depends="boost" short_desc+=" - libboost_random" pkg_install() { @@ -338,7 +322,7 @@ libboost_random1.72_package() { } } -libboost_regex1.72_package() { +libboost_regex1.79_package() { depends="boost" short_desc+=" - libboost_regex" pkg_install() { @@ -346,7 +330,7 @@ libboost_regex1.72_package() { } } -libboost_serialization1.72_package() { +libboost_serialization1.79_package() { depends="boost" short_desc+=" - libboost_serialization" pkg_install() { @@ -354,31 +338,7 @@ libboost_serialization1.72_package() { } } -libboost_stacktrace_addr2line1.72_package() { - depends="boost" - short_desc+=" - libboost_stacktrace_addr2line" - pkg_install() { - vmove usr/lib/libboost_stacktrace_addr2line.so.* - } -} - -libboost_stacktrace_basic1.72_package() { - depends="boost" - short_desc+=" - libboost_stacktrace_basic" - pkg_install() { - vmove usr/lib/libboost_stacktrace_basic.so.* - } -} - -libboost_stacktrace_noop1.72_package() { - depends="boost" - short_desc+=" - libboost_stacktrace_noop" - pkg_install() { - vmove usr/lib/libboost_stacktrace_noop.so.* - } -} - -libboost_system1.72_package() { +libboost_system1.79_package() { depends="boost" short_desc+=" - libboost_system" pkg_install() { @@ -386,7 +346,7 @@ libboost_system1.72_package() { } } -libboost_thread1.72_package() { +libboost_thread1.79_package() { depends="boost" short_desc+=" - libboost_thread" pkg_install() { @@ -394,7 +354,7 @@ libboost_thread1.72_package() { } } -libboost_timer1.72_package() { +libboost_timer1.79_package() { depends="boost" short_desc+=" - libboost_timer" pkg_install() { @@ -402,7 +362,7 @@ libboost_timer1.72_package() { } } -libboost_type_erasure1.72_package() { +libboost_type_erasure1.79_package() { depends="boost" short_desc+=" - libboost_type_erasure" pkg_install() { @@ -410,7 +370,7 @@ libboost_type_erasure1.72_package() { } } -libboost_unit_test_framework1.72_package() { +libboost_unit_test_framework1.79_package() { depends="boost" short_desc+=" - libboost_unit_test_framework" pkg_install() { @@ -418,7 +378,7 @@ libboost_unit_test_framework1.72_package() { } } -libboost_wave1.72_package() { +libboost_wave1.79_package() { depends="boost" short_desc+=" - libboost_wave" pkg_install() { @@ -426,7 +386,7 @@ libboost_wave1.72_package() { } } -libboost_wserialization1.72_package() { +libboost_wserialization1.79_package() { depends="boost" short_desc+=" - libboost_wserialization" pkg_install() { diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79 similarity index 100% rename from srcpkgs/libboost_atomic1.72 rename to srcpkgs/libboost_atomic1.79 diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79 similarity index 100% rename from srcpkgs/libboost_chrono1.72 rename to srcpkgs/libboost_chrono1.79 diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79 similarity index 100% rename from srcpkgs/libboost_container1.72 rename to srcpkgs/libboost_container1.79 diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79 similarity index 100% rename from srcpkgs/libboost_context1.72 rename to srcpkgs/libboost_context1.79 diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79 similarity index 100% rename from srcpkgs/libboost_contract1.72 rename to srcpkgs/libboost_contract1.79 diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79 similarity index 100% rename from srcpkgs/libboost_coroutine1.72 rename to srcpkgs/libboost_coroutine1.79 diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79 similarity index 100% rename from srcpkgs/libboost_date_time1.72 rename to srcpkgs/libboost_date_time1.79 diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79 similarity index 100% rename from srcpkgs/libboost_fiber1.72 rename to srcpkgs/libboost_filesystem1.79 diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79 similarity index 100% rename from srcpkgs/libboost_filesystem1.72 rename to srcpkgs/libboost_graph1.79 diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79 similarity index 100% rename from srcpkgs/libboost_graph1.72 rename to srcpkgs/libboost_iostreams1.79 diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale1.79 similarity index 100% rename from srcpkgs/libboost_iostreams1.72 rename to srcpkgs/libboost_locale1.79 diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log1.79 similarity index 100% rename from srcpkgs/libboost_locale1.72 rename to srcpkgs/libboost_log1.79 diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup1.79 similarity index 100% rename from srcpkgs/libboost_log1.72 rename to srcpkgs/libboost_log_setup1.79 diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c991.79 similarity index 100% rename from srcpkgs/libboost_log_setup1.72 rename to srcpkgs/libboost_math_c991.79 diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f1.79 similarity index 100% rename from srcpkgs/libboost_math_c991.72 rename to srcpkgs/libboost_math_c99f1.79 diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l1.79 similarity index 100% rename from srcpkgs/libboost_math_c99f1.72 rename to srcpkgs/libboost_math_c99l1.79 diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr11.79 similarity index 100% rename from srcpkgs/libboost_math_c99l1.72 rename to srcpkgs/libboost_math_tr11.79 diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f1.79 similarity index 100% rename from srcpkgs/libboost_math_tr11.72 rename to srcpkgs/libboost_math_tr1f1.79 diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l1.79 similarity index 100% rename from srcpkgs/libboost_math_tr1f1.72 rename to srcpkgs/libboost_math_tr1l1.79 diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor1.79 similarity index 100% rename from srcpkgs/libboost_math_tr1l1.72 rename to srcpkgs/libboost_prg_exec_monitor1.79 diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options1.79 similarity index 100% rename from srcpkgs/libboost_prg_exec_monitor1.72 rename to srcpkgs/libboost_program_options1.79 diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random1.79 similarity index 100% rename from srcpkgs/libboost_program_options1.72 rename to srcpkgs/libboost_random1.79 diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex1.79 similarity index 100% rename from srcpkgs/libboost_random1.72 rename to srcpkgs/libboost_regex1.79 diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization1.79 similarity index 100% rename from srcpkgs/libboost_regex1.72 rename to srcpkgs/libboost_serialization1.79 diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system1.79 similarity index 100% rename from srcpkgs/libboost_serialization1.72 rename to srcpkgs/libboost_system1.79 diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread1.79 similarity index 100% rename from srcpkgs/libboost_stacktrace_addr2line1.72 rename to srcpkgs/libboost_thread1.79 diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer1.79 similarity index 100% rename from srcpkgs/libboost_stacktrace_basic1.72 rename to srcpkgs/libboost_timer1.79 diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_type_erasure1.72 deleted file mode 120000 index baef819c48f6..000000000000 --- a/srcpkgs/libboost_type_erasure1.72 +++ /dev/null @@ -1 +0,0 @@ -boost \ No newline at end of file diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure1.79 similarity index 100% rename from srcpkgs/libboost_stacktrace_noop1.72 rename to srcpkgs/libboost_type_erasure1.79 diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_unit_test_framework1.72 deleted file mode 120000 index baef819c48f6..000000000000 --- a/srcpkgs/libboost_unit_test_framework1.72 +++ /dev/null @@ -1 +0,0 @@ -boost \ No newline at end of file diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_unit_test_framework1.79 similarity index 100% rename from srcpkgs/libboost_system1.72 rename to srcpkgs/libboost_unit_test_framework1.79 diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72 deleted file mode 120000 index baef819c48f6..000000000000 --- a/srcpkgs/libboost_wave1.72 +++ /dev/null @@ -1 +0,0 @@ -boost \ No newline at end of file diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_wave1.79 similarity index 100% rename from srcpkgs/libboost_thread1.72 rename to srcpkgs/libboost_wave1.79 diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72 deleted file mode 120000 index baef819c48f6..000000000000 --- a/srcpkgs/libboost_wserialization1.72 +++ /dev/null @@ -1 +0,0 @@ -boost \ No newline at end of file diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_wserialization1.79 similarity index 100% rename from srcpkgs/libboost_timer1.72 rename to srcpkgs/libboost_wserialization1.79 From b5d5fc24538d86768bde127e5dc4e6d00aa9d42b Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Fri, 18 Mar 2022 18:29:05 +0200 Subject: [PATCH 2/2] boost: quote all vmove's with a glob. [ci skip] this doesn't even build locally correctly yet --- srcpkgs/boost/template | 62 +++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index f8100f1cb3c2..9e3d6aec031e 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -150,7 +150,7 @@ libboost_atomic1.79_package() { depends="boost" short_desc+=" - libboost_atomic" pkg_install() { - vmove usr/lib/libboost_atomic.so.* + vmove "usr/lib/libboost_atomic.so.*" } } @@ -158,7 +158,7 @@ libboost_chrono1.79_package() { depends="boost" short_desc+=" - libboost_chrono" pkg_install() { - vmove usr/lib/libboost_chrono.so.* + vmove "usr/lib/libboost_chrono.so.*" } } @@ -166,7 +166,7 @@ libboost_container1.79_package() { depends="boost" short_desc+=" - libboost_container" pkg_install() { - vmove usr/lib/libboost_container.so.* + vmove "usr/lib/libboost_container.so.*" } } @@ -174,7 +174,7 @@ libboost_context1.79_package() { depends="boost" short_desc+=" - libboost_context" pkg_install() { - vmove usr/lib/libboost_context.so.* + vmove "usr/lib/libboost_context.so.*" } } @@ -182,7 +182,7 @@ libboost_contract1.79_package() { depends="boost" short_desc+=" - libboost_contract" pkg_install() { - vmove usr/lib/libboost_contract.so.* + vmove "usr/lib/libboost_contract.so.*" } } @@ -190,7 +190,7 @@ libboost_coroutine1.79_package() { depends="boost" short_desc+=" - libboost_coroutine" pkg_install() { - vmove usr/lib/libboost_coroutine.so.* + vmove "usr/lib/libboost_coroutine.so.*" } } @@ -198,7 +198,7 @@ libboost_date_time1.79_package() { depends="boost" short_desc+=" - libboost_date_time" pkg_install() { - vmove usr/lib/libboost_date_time.so.* + vmove "usr/lib/libboost_date_time.so.*" } } @@ -206,7 +206,7 @@ libboost_filesystem1.79_package() { depends="boost" short_desc+=" - libboost_filesystem" pkg_install() { - vmove usr/lib/libboost_filesystem.so.* + vmove "usr/lib/libboost_filesystem.so.*" } } @@ -214,7 +214,7 @@ libboost_graph1.79_package() { depends="boost" short_desc+=" - libboost_graph" pkg_install() { - vmove usr/lib/libboost_graph.so.* + vmove "usr/lib/libboost_graph.so.*" } } @@ -222,7 +222,7 @@ libboost_iostreams1.79_package() { depends="boost" short_desc+=" - libboost_iostreams" pkg_install() { - vmove usr/lib/libboost_iostreams.so.* + vmove "usr/lib/libboost_iostreams.so.*" } } @@ -230,7 +230,7 @@ libboost_locale1.79_package() { depends="boost" short_desc+=" - libboost_locale" pkg_install() { - vmove usr/lib/libboost_locale.so.* + vmove "usr/lib/libboost_locale.so.*" } } @@ -238,7 +238,7 @@ libboost_log1.79_package() { depends="boost" short_desc+=" - libboost_log" pkg_install() { - vmove usr/lib/libboost_log.so.* + vmove "usr/lib/libboost_log.so.*" } } @@ -246,7 +246,7 @@ libboost_log_setup1.79_package() { depends="boost" short_desc+=" - libboost_log_setup" pkg_install() { - vmove usr/lib/libboost_log_setup.so.* + vmove "usr/lib/libboost_log_setup.so.*" } } @@ -254,7 +254,7 @@ libboost_math_c991.79_package() { depends="boost" short_desc+=" - libboost_math_c99" pkg_install() { - vmove usr/lib/libboost_math_c99.so.* + vmove "usr/lib/libboost_math_c99.so.*" } } @@ -262,7 +262,7 @@ libboost_math_c99f1.79_package() { depends="boost" short_desc+=" - libboost_math_c99f" pkg_install() { - vmove usr/lib/libboost_math_c99f.so.* + vmove "usr/lib/libboost_math_c99f.so.*" } } @@ -270,7 +270,7 @@ libboost_math_c99l1.79_package() { depends="boost" short_desc+=" - libboost_math_c99l" pkg_install() { - vmove usr/lib/libboost_math_c99l.so.* + vmove "usr/lib/libboost_math_c99l.so.*" } } @@ -278,7 +278,7 @@ libboost_math_tr11.79_package() { depends="boost" short_desc+=" - libboost_math_tr1" pkg_install() { - vmove usr/lib/libboost_math_tr1.so.* + vmove "usr/lib/libboost_math_tr1.so.*" } } @@ -286,7 +286,7 @@ libboost_math_tr1f1.79_package() { depends="boost" short_desc+=" - libboost_math_tr1f" pkg_install() { - vmove usr/lib/libboost_math_tr1f.so.* + vmove "usr/lib/libboost_math_tr1f.so.*" } } @@ -294,7 +294,7 @@ libboost_math_tr1l1.79_package() { depends="boost" short_desc+=" - libboost_math_tr1l" pkg_install() { - vmove usr/lib/libboost_math_tr1l.so.* + vmove "usr/lib/libboost_math_tr1l.so.*" } } @@ -302,7 +302,7 @@ libboost_prg_exec_monitor1.79_package() { depends="boost" short_desc+=" - libboost_prg_exec_monitor" pkg_install() { - vmove usr/lib/libboost_prg_exec_monitor.so.* + vmove "usr/lib/libboost_prg_exec_monitor.so.*" } } @@ -310,7 +310,7 @@ libboost_program_options1.79_package() { depends="boost" short_desc+=" - libboost_program_options" pkg_install() { - vmove usr/lib/libboost_program_options.so.* + vmove "usr/lib/libboost_program_options.so.*" } } @@ -318,7 +318,7 @@ libboost_random1.79_package() { depends="boost" short_desc+=" - libboost_random" pkg_install() { - vmove usr/lib/libboost_random.so.* + vmove "usr/lib/libboost_random.so.*" } } @@ -326,7 +326,7 @@ libboost_regex1.79_package() { depends="boost" short_desc+=" - libboost_regex" pkg_install() { - vmove usr/lib/libboost_regex.so.* + vmove "usr/lib/libboost_regex.so.*" } } @@ -334,7 +334,7 @@ libboost_serialization1.79_package() { depends="boost" short_desc+=" - libboost_serialization" pkg_install() { - vmove usr/lib/libboost_serialization.so.* + vmove "usr/lib/libboost_serialization.so.*" } } @@ -342,7 +342,7 @@ libboost_system1.79_package() { depends="boost" short_desc+=" - libboost_system" pkg_install() { - vmove usr/lib/libboost_system.so.* + vmove "usr/lib/libboost_system.so.*" } } @@ -350,7 +350,7 @@ libboost_thread1.79_package() { depends="boost" short_desc+=" - libboost_thread" pkg_install() { - vmove usr/lib/libboost_thread.so.* + vmove "usr/lib/libboost_thread.so.*" } } @@ -358,7 +358,7 @@ libboost_timer1.79_package() { depends="boost" short_desc+=" - libboost_timer" pkg_install() { - vmove usr/lib/libboost_timer.so.* + vmove "usr/lib/libboost_timer.so.*" } } @@ -366,7 +366,7 @@ libboost_type_erasure1.79_package() { depends="boost" short_desc+=" - libboost_type_erasure" pkg_install() { - vmove usr/lib/libboost_type_erasure.so.* + vmove "usr/lib/libboost_type_erasure.so.*" } } @@ -374,7 +374,7 @@ libboost_unit_test_framework1.79_package() { depends="boost" short_desc+=" - libboost_unit_test_framework" pkg_install() { - vmove usr/lib/libboost_unit_test_framework.so.* + vmove "usr/lib/libboost_unit_test_framework.so.*" } } @@ -382,7 +382,7 @@ libboost_wave1.79_package() { depends="boost" short_desc+=" - libboost_wave" pkg_install() { - vmove usr/lib/libboost_wave.so.* + vmove "usr/lib/libboost_wave.so.*" } } @@ -390,6 +390,6 @@ libboost_wserialization1.79_package() { depends="boost" short_desc+=" - libboost_wserialization" pkg_install() { - vmove usr/lib/libboost_wserialization.so.* + vmove "usr/lib/libboost_wserialization.so.*" } }