Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6ec26e378c68258d9229993d8e7e0dea0bdb9bfa)
  • Date: Sat, 4 Jan 2025 16:37:44 +0000

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

ChangeLog | 4 ++++
FUNCTIONS | 37 ++++++++++++++++++++++++++++++++++++-
disk/acl/BUILD | 1 +
disk/acl/DEPENDS | 4 ++--
disk/acl/HISTORY | 5 +++++
disk/acl/PRE_BUILD | 5 -----
6 files changed, 48 insertions(+), 8 deletions(-)

New commits:
commit 6ec26e378c68258d9229993d8e7e0dea0bdb9bfa
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

acl: Use slibtool

commit 0973d5a8adf79abed7fb42dfde30c05108b88eb7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

acl: Fix build against musl

commit 2efdb0b83c806f3582e344aa3d5382be63701c4b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

acl: remove PRE_BUILD, no longer needed

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

FUNCTIONS: Add functions to aid disabling .la files

- patch_bundled_libtool: patch ltmain.sh to not install .la files
- patch_configure_libtool_override: patch configure script to not override
the LIBTOOL variable

Both are automatically called from default_pre_build, and search
well-known
locations for their respective target files, but can be called with custom
arguments if necessary.

diff --git a/ChangeLog b/ChangeLog
index 748059c..2e901d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2025-01-04 Ismael Luceno <ismael AT sourcemage.org>
+ * FUNCTIONS: added patch_bundled_libtool function
+ added patch_configure_libtool_override function
+
2025-01-01 Pavel Vinogradov <public AT sourcemage.org>
* gnu.gpg: new key, A186278D426A38E9, Ken Pizzini <ken AT gnu.org>

diff --git a/FUNCTIONS b/FUNCTIONS
index 39b4772..a746c35 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -52,7 +52,11 @@ function default_grimoire_post_install () {
#---------------------------------------------------------------------
function default_pre_build () {
invoke_gcc &&
- real_default_pre_build
+ real_default_pre_build &&
+ cd "$SOURCE_DIRECTORY" &&
+ patch_configure_libtool_override &&
+ patch_bundled_libtool &&
+ cd -
}

#---------------------------------------------------------------------
@@ -307,6 +311,37 @@ apply_patch_dir() {
}

#---------------------------------------------------------------------
+## Patch bundled libtool to disable installation of .la files
+#---------------------------------------------------------------------
+patch_bundled_libtool() {
+ if [ $# = 0 ]; then
+ if [ -e ltmain.sh ]; then
+ set -- ltmain.sh
+ elif [ -e build-aux/ltmain.sh ]; then
+ set -- build-aux/ltmain.sh
+ else
+ return 0
+ fi
+ fi &&
+ message "${MESSAGE_COLOR}Patching: $FILE_COLOR$*$DEFAULT_COLOR"
+ sed -E -i -e \
+ '/^[\t ]*(func_show_|[$]run )eval "[$]install_prog [$]instname /d' \
+ "$@"
+}
+patch_configure_libtool_override() {
+ if [ $# = 0 ]; then
+ if [ -e configure ]; then
+ set -- configure
+ else
+ return 0
+ fi
+ fi
+ message "${MESSAGE_COLOR}Patching: $FILE_COLOR$*$DEFAULT_COLOR"
+ sed -i -e '/^LIBTOOL=/d' "$@"
+}
+
+
+#---------------------------------------------------------------------
## Removes traces of NSPR and NSS from Mozilla-based software
## TODO move patch to a central place
#---------------------------------------------------------------------
diff --git a/disk/acl/BUILD b/disk/acl/BUILD
index 1efb08b..150de53 100755
--- a/disk/acl/BUILD
+++ b/disk/acl/BUILD
@@ -1,2 +1,3 @@
OPTS="$OPTS --libdir=${INSTALL_ROOT}/lib" &&
+CPPFLAGS+=' -D_LARGEFILE64_SOURCE' && # Fix build on non-glibc systems
default_build
diff --git a/disk/acl/DEPENDS b/disk/acl/DEPENDS
index a4d35b0..0fb6888 100755
--- a/disk/acl/DEPENDS
+++ b/disk/acl/DEPENDS
@@ -1,2 +1,2 @@
-depends libtool &&
-depends attr
+depends attr &&
+depends slibtool LIBTOOL=slibtool-shared
diff --git a/disk/acl/HISTORY b/disk/acl/HISTORY
index 367a873..5d55ca1 100644
--- a/disk/acl/HISTORY
+++ b/disk/acl/HISTORY
@@ -1,3 +1,8 @@
+2025-01-04 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: removed, no longer needed; handled in FUNCTIONS
+ * BUILD: fixed build against musl
+ * DEPENDS: added slibtool
+
2022-01-27 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: disabled installation of libtool pseudo-libraries
* DETAILS: PATCHLEVEL++
diff --git a/disk/acl/PRE_BUILD b/disk/acl/PRE_BUILD
deleted file mode 100755
index e352e2c..0000000
--- a/disk/acl/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-# disable instalation of libtool pseudo-libraries
-sed -E -i '/^[\t ]*(func_show_|$run )eval "[$]install_prog [$]instname /d' \
- build-aux/ltmain.sh


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (6ec26e378c68258d9229993d8e7e0dea0bdb9bfa), Ismael Luceno, 01/04/2025

Archive powered by MHonArc 2.6.24.

Top of Page