Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (66bab772cdd6d34e675a22f4fb9d6920db769585)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (66bab772cdd6d34e675a22f4fb9d6920db769585)
  • Date: Wed, 16 Mar 2022 17:32:26 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/boost/DEPENDS | 2
libs/boost/HISTORY | 4 +
libs/boost/PRE_BUILD | 7 +-
libs/boost/PRE_SUB_DEPENDS | 3 -
libs/boost/REPAIR^all^PRE_SUB_DEPENDS | 3 -
libs/boost/patches/boost-1.78.0-interprocess-musl-include.patch | 25
++++++++++
6 files changed, 35 insertions(+), 9 deletions(-)

New commits:
commit 66bab772cdd6d34e675a22f4fb9d6920db769585
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

boost: Fix build against musl

commit 7288a69a9b6884bee86ec3b6daf59f63d1e663b5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

boost: Remove support for python2

Nobody should be using it by now.

diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index 850f8a9..eed852f 100755
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
if list_find "$BOOST_LIBS_MZ" "python" ||
[[ $BOOST_SELECT_LIBS == "n" ]]
then
- depends PYTHON
+ depends python3
fi &&
if list_find "$BOOST_LIBS_AL" "graph" ||
[[ $BOOST_SELECT_LIBS == "n" ]]
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index b86ff37..4c647c4 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2022-03-16 Ismael Luceno <ismael AT iodev.co.uk>
+ * DEPENDS, PRE_BUILD, *PRE_SUB_DEPENDS: removed support for python2
+ * patches/boost-1.78.0-interprocess-musl-include.patch: fixed build
against musl
+
2021-12-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.78.0

diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index d074182..530b33a 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -1,9 +1,8 @@
list_remove BOOST_LIBS_MZ signals &&
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL python3;then
- sed -i 's/python$/&3/;s/sys.prefix/(&)/' bootstrap.sh
-fi &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+sed -i '/^PYTHON=/{s/=.*/=python3/}' bootstrap.sh &&
sed '/char\* next_in/s;s->next_in;const_cast<zlib::byte*>(&);' \
-i libs/iostreams/src/zlib.cpp &&
message "patching done"
diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index fbeb810..abc50a8 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -12,8 +12,7 @@ case $THIS_SUB_DEPENDS in
DATE_TIME) list_find "$BOOST_LIBS_AL" date_time ;;
IOSTREAMS) list_find "$BOOST_LIBS_AL" iostreams ;;
RANDOM) list_find "$BOOST_LIBS_MZ" random ;;
- PYTHON) is_depends_enabled $SPELL python ||
- is_depends_enabled $SPELL python3 ;;
+ PYTHON) is_depends_enabled "$SPELL" python3 ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
diff --git a/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
b/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
index 090a1db..31b0128 100755
--- a/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
@@ -12,8 +12,7 @@ case $THIS_SUB_DEPENDS in
DATE_TIME) list_find "$BOOST_LIBS_AL" date_time ;;
IOSTREAMS) list_find "$BOOST_LIBS_AL" iostreams ;;
RANDOM) list_find "$BOOST_LIBS_MZ" random ;;
- PYTHON) is_depends_enabled $SPELL python ||
- is_depends_enabled $SPELL python3 ;;
+ PYTHON) is_depends_enabled "$SPELL" python3 ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
diff --git a/libs/boost/patches/boost-1.78.0-interprocess-musl-include.patch
b/libs/boost/patches/boost-1.78.0-interprocess-musl-include.patch
new file mode 100644
index 0000000..1b9658c
--- /dev/null
+++ b/libs/boost/patches/boost-1.78.0-interprocess-musl-include.patch
@@ -0,0 +1,25 @@
+Status: Backport
[https://github.com/boostorg/interprocess/commit/d002a0d929ecb031843d806c2bda69e013442e13]
+Origin: Gentoo [https://bugs.gentoo.org/829147]
+
+From: Leonardo Neumann <leonardo AT neumann.dev.br>
+Date: Mon, 13 Dec 2021 01:07:20 -0300
+Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
+
+Boost 1.78.0 fails to build on musl-based systems because musl does
+not include sys/stat.h by default.
+
+Fixes #161 ("Boost compiler error")
+--- a/boost/interprocess/permissions.hpp
++++ b/boost/interprocess/permissions.hpp
+@@ -29,6 +29,10 @@
+
+ #include <boost/interprocess/detail/win32_api.hpp>
+
++#else
++
++#include <sys/stat.h>
++
+ #endif
+
+ #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (66bab772cdd6d34e675a22f4fb9d6920db769585), Ismael Luceno, 03/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page