Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.

[JamiKettunen <JamiKettunen@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 3496 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
For now I've also dropped the `boost` version from all subpkg names as was previously done for `protobuf` with f38a742bec751aa8c3d9c592e020503256d27a1c, let me know if this should be kept or not; imho maintaining this would be easier if we don't gave versioned pkgnames.

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now (is this ok?).

#### Solved issues
The `failed to install target dependencies! (error 40)` issue was fixed by making new subpackages for `libboost_json.so.*` & `libboost_nowide.so.*`; they were inside the `boost` pkg, depended on `libboost_container` which itself depends on `boost` => circular dependency.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### To-Do
- Include ~90 commits from `xrevbump 'revbump for boost-1.79.0.b1.' <xrevshlib boost output from master>`

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 39742 bytes --]

From c5b747312babe166203d7a12db308c3f4b121176 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/3] boost: update to 1.79.0.b1.

---
 common/shlibs                                 |  60 +++---
 srcpkgs/{boost-python1.72 => boost-python}    |   0
 srcpkgs/{boost-python3-1.72 => boost-python3} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 189 +++++++-----------
 .../{libboost_atomic1.72 => libboost_atomic}  |   0
 .../{libboost_chrono1.72 => libboost_chrono}  |   0
 ...boost_container1.72 => libboost_container} |   0
 ...{libboost_context1.72 => libboost_context} |   0
 ...ibboost_contract1.72 => libboost_contract} |   0
 ...boost_coroutine1.72 => libboost_coroutine} |   0
 ...boost_date_time1.72 => libboost_date_time} |   0
 ...libboost_fiber1.72 => libboost_filesystem} |   0
 ...libboost_filesystem1.72 => libboost_graph} |   0
 ...{libboost_graph1.72 => libboost_iostreams} |   0
 ...libboost_iostreams1.72 => libboost_locale} |   0
 srcpkgs/{libboost_locale1.72 => libboost_log} |   0
 .../{libboost_log1.72 => libboost_log_setup}  |   0
 ...bboost_log_setup1.72 => libboost_math_c99} |   0
 ...bboost_math_c991.72 => libboost_math_c99f} |   0
 ...boost_math_c99f1.72 => libboost_math_c99l} |   0
 ...bboost_math_c99l1.72 => libboost_math_tr1} |   0
 ...bboost_math_tr11.72 => libboost_math_tr1f} |   0
 ...boost_math_tr1f1.72 => libboost_math_tr1l} |   0
 ...ath_tr1l1.72 => libboost_prg_exec_monitor} |   0
 ...c_monitor1.72 => libboost_program_options} |   0
 ...st_program_options1.72 => libboost_random} |   0
 .../{libboost_random1.72 => libboost_regex}   |   0
 ...boost_regex1.72 => libboost_serialization} |   0
 ...oost_serialization1.72 => libboost_system} |   0
 ...acktrace_addr2line1.72 => libboost_thread} |   0
 ...st_stacktrace_basic1.72 => libboost_timer} |   0
 ...cktrace_noop1.72 => libboost_type_erasure} |   0
 srcpkgs/libboost_type_erasure1.72             |   1 -
 ...ystem1.72 => libboost_unit_test_framework} |   0
 srcpkgs/libboost_unit_test_framework1.72      |   1 -
 .../{libboost_thread1.72 => libboost_wave}    |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...oost_timer1.72 => libboost_wserialization} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 41 files changed, 102 insertions(+), 198 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_locale} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_log} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log_setup} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c99} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr1} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_random} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_regex} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_serialization} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_system} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure} (100%)
 delete mode 120000 srcpkgs/libboost_type_erasure1.72
 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework} (100%)
 delete mode 120000 srcpkgs/libboost_unit_test_framework1.72
 rename srcpkgs/{libboost_thread1.72 => libboost_wave} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..4fd6c2cc428e 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_context-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-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-python
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3
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 <riehecky@fnal.gov>
-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<char *>(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<char*>("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..bc16a6841041 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,62 +1,24 @@
 # 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 <me@johnnynator.dev>"
 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"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- 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  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -74,10 +36,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 +79,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +87,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +105,20 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options libboost_math_c99f
+ libboost_iostreams libboost_math_tr1l libboost_filesystem
+ libboost_chrono libboost_math_tr1f libboost_wave
+ libboost_graph libboost_locale libboost_regex
+ libboost_type_erasure libboost_coroutine
+ libboost_atomic libboost_prg_exec_monitor libboost_math_c99
+ boost-python3 libboost_log_setup
+ libboost_timer libboost_system libboost_unit_test_framework
+ libboost_serialization libboost_math_tr1 boost-build
+ libboost_math_c99l boost-python libboost_contract
+ libboost_date_time libboost_log libboost_random
+ libboost_thread libboost_container boost-jam
+ libboost_wserialization libboost_context libboost_json
+ libboost_nowide"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +127,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +135,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +143,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +151,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +159,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +167,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +175,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +183,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_filesystem_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +191,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +199,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +207,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +215,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +223,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +231,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +239,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +247,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +255,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +263,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +271,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +279,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +287,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +295,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +303,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +311,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +319,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_system_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +327,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +335,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +343,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +351,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +359,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +367,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_locale
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_log
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log_setup
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c99
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_math_c99
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99f
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99l
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr1
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_tr1
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1f
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1l
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_prg_exec_monitor
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_program_options
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_random
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_regex
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_serialization
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_system
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_thread
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_timer
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_type_erasure
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_system1.72 b/srcpkgs/libboost_unit_test_framework
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_unit_test_framework
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_thread1.72 b/srcpkgs/libboost_wave
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_wave
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_timer1.72 b/srcpkgs/libboost_wserialization
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_wserialization
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

From 5a5881be3bfaad1c3eed39411de10b7ca7ea4b78 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/3] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index bc16a6841041..f88d566abd55 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -131,7 +131,7 @@ libboost_atomic_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -139,7 +139,7 @@ libboost_chrono_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -147,7 +147,7 @@ libboost_container_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -155,7 +155,7 @@ libboost_context_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -163,7 +163,7 @@ libboost_contract_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -171,7 +171,7 @@ libboost_coroutine_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -179,7 +179,7 @@ libboost_date_time_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -187,7 +187,7 @@ libboost_filesystem_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -195,7 +195,7 @@ libboost_graph_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -203,7 +203,7 @@ libboost_iostreams_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -211,7 +211,7 @@ libboost_locale_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -219,7 +219,7 @@ libboost_log_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -227,7 +227,7 @@ libboost_log_setup_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -235,7 +235,7 @@ libboost_math_c99_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -243,7 +243,7 @@ libboost_math_c99f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -251,7 +251,7 @@ libboost_math_c99l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -259,7 +259,7 @@ libboost_math_tr1_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -267,7 +267,7 @@ libboost_math_tr1f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -275,7 +275,7 @@ libboost_math_tr1l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -283,7 +283,7 @@ libboost_prg_exec_monitor_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.*"
 	}
 }
 
@@ -291,7 +291,7 @@ libboost_program_options_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -299,7 +299,7 @@ libboost_random_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -307,7 +307,7 @@ libboost_regex_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -315,7 +315,7 @@ libboost_serialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -323,7 +323,7 @@ libboost_system_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -331,7 +331,7 @@ libboost_thread_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -339,7 +339,7 @@ libboost_timer_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -347,7 +347,7 @@ libboost_type_erasure_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -355,7 +355,7 @@ libboost_unit_test_framework_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.*"
 	}
 }
 
@@ -363,7 +363,7 @@ libboost_wave_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -371,7 +371,7 @@ libboost_wserialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From ede197280d6cd313fd5641541f9ddb31aa85a184 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 19:47:24 +0200
Subject: [PATCH 3/3] opencamlib: migrate away from versioned
 libboost_program_options

[ci skip] this doesn't even build locally correctly yet
---
 srcpkgs/opencamlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index f837b50c5556..07d007cf2fc9 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,11 +1,11 @@
 # Template file for 'opencamlib'
 pkgname=opencamlib
 version=2019.07
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
 hostmakedepends="python3"
-makedepends="python3-devel boost-devel libboost_program_options1.72 libgomp-devel"
+makedepends="python3-devel boost-devel libboost_program_options libgomp-devel"
 short_desc="Open source computer aided manufacturing algorithms library"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-2.1-or-later"