Skip to Content.
Sympa Menu

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

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 (14b961da9d127b0bd660f40fac2a27a17b57f903)
  • Date: Tue, 14 May 2019 00:28:46 +0000

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

ChangeLog | 3 +++
FUNCTIONS | 1 +
database/db/HISTORY | 3 +++
database/db/PRE_BUILD | 2 ++
database/db/db-5.3.28-musl-detect.patch | 10 ++++++++++
5 files changed, 19 insertions(+)

New commits:
commit 14b961da9d127b0bd660f40fac2a27a17b57f903
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

db: Fix build against musl

commit 418f17581b85092fb5229900c1e1a683570e3e01
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Make glibc_is_nptl true for musl

diff --git a/ChangeLog b/ChangeLog
index 471eafc..78b50ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-05-14 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: made glibc_is_nptl true for musl
+
2019-05-11 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/wsgibrotli: new spell, Brotli compression WSGI
middleware

diff --git a/FUNCTIONS b/FUNCTIONS
index 6dff757..8f214cc 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -69,6 +69,7 @@ function default_pre_build () {
#---------------------------------------------------------------------
function glibc_is_nptl ()
{
+ [ musl = "${HOST##*-}" ] && return 0
if getconf GNU_LIBPTHREAD_VERSION | grep -q NPTL; then
return 0
fi
diff --git a/database/db/HISTORY b/database/db/HISTORY
index e9035a3..f81de23 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,6 @@
+2019-05-14 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, db-5.3.28-musl-detect.patch: Fixed build against musl
+
2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Move javafix.diff to PRE_BUILD
* PRE_BUILD: Apply javafix.diff
diff --git a/database/db/PRE_BUILD b/database/db/PRE_BUILD
index 4068dcca..5608e63 100755
--- a/database/db/PRE_BUILD
+++ b/database/db/PRE_BUILD
@@ -7,4 +7,6 @@ patch -p1 < "${SPELL_DIRECTORY}"/javafix.diff &&
message "${MESSAGE_COLOR}Applying GCC 8.x Clang fix...${DEFAULT_COLOR}" &&
patch -p1 <
"${SPELL_DIRECTORY}"/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
&&

+patch -fp1 -i "$SPELL_DIRECTORY"/db-5.3.28-musl-detect.patch &&
+
sedit 's|\(docdir\w*=\w*[^/]*\)/docs|\1/share/doc/db|' dist/Makefile.in
diff --git a/database/db/db-5.3.28-musl-detect.patch
b/database/db/db-5.3.28-musl-detect.patch
new file mode 100644
index 0000000..72809bb
--- /dev/null
+++ b/database/db/db-5.3.28-musl-detect.patch
@@ -0,0 +1,10 @@
+--- db-5.3.28/dist/config.sub.orig 2019-05-14 01:47:55.953219891 +0200
++++ db-5.3.28/dist/config.sub 2019-05-14 01:48:35.713528717 +0200
+@@ -125,6 +125,7 @@
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* |
\
++ linux-musl* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (14b961da9d127b0bd660f40fac2a27a17b57f903), Ismael Luceno, 05/13/2019

Archive powered by MHonArc 2.6.24.

Top of Page