Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by David C. Haley (e16e875281b22d20b9fcfd1ae7a5b07951c54bfa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "David C. Haley" <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 David C. Haley (e16e875281b22d20b9fcfd1ae7a5b07951c54bfa)
  • Date: Wed, 10 Jul 2024 04:45:51 +0000

GIT changes to master grimoire by David C. Haley <khoralin AT gmail.com>:

archive/xz-utils/BUILD | 3 ++-
archive/xz-utils/CONFIGURE | 1 -
archive/xz-utils/DEPENDS | 5 ++---
archive/xz-utils/DETAILS | 1 -
archive/xz-utils/FINAL | 3 +++
archive/xz-utils/HISTORY | 5 -----
archive/xz-utils/INSTALL | 4 ++++
archive/xz-utils/PRE_BUILD | 8 ++++++++
8 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit e16e875281b22d20b9fcfd1ae7a5b07951c54bfa
Author: David C. Haley <khoralin AT gmail.com>
Commit: David C. Haley <khoralin AT gmail.com>

Revert "xz-utils - cmake build'"
Reverts commit 7ac2377de473804c7b745f36403fc34bd1a7b824.

Commit caused circular dependency between cmake and xz-utils.

diff --git a/archive/xz-utils/BUILD b/archive/xz-utils/BUILD
index d215285..01d506a 100755
--- a/archive/xz-utils/BUILD
+++ b/archive/xz-utils/BUILD
@@ -1,2 +1,3 @@
-OPTS+=" -DBUILD_SHARED_LIBS=1" &&
+OPTS+=" --exec-prefix=${INSTALL_ROOT}" &&
+
default_build
diff --git a/archive/xz-utils/CONFIGURE b/archive/xz-utils/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/archive/xz-utils/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/archive/xz-utils/DEPENDS b/archive/xz-utils/DEPENDS
index b476b5e..c1d2655 100755
--- a/archive/xz-utils/DEPENDS
+++ b/archive/xz-utils/DEPENDS
@@ -1,5 +1,4 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
optional_depends GETTEXT \
- " -DENABLE_NLS=1" \
- " -DENABLE_NLS=0" \
+ "--enable-nls" \
+ "--disable-nls" \
"for Native Language Support"
diff --git a/archive/xz-utils/DETAILS b/archive/xz-utils/DETAILS
index 6be93fa..e55d945 100755
--- a/archive/xz-utils/DETAILS
+++ b/archive/xz-utils/DETAILS
@@ -1,4 +1,3 @@
-source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=xz-utils
VERSION=5.6.2
PATCHLEVEL=1
diff --git a/archive/xz-utils/FINAL b/archive/xz-utils/FINAL
new file mode 100755
index 0000000..ec3888c
--- /dev/null
+++ b/archive/xz-utils/FINAL
@@ -0,0 +1,3 @@
+#!/bin/bash
+# fix obsolete references to liblzma.la
+sed -i 's|/usr/lib/liblzma.la|-llzma|g' {/usr,}/lib/*\.la
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index 72339ba..0fbb95b 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,8 +1,3 @@
-2024-06-06 Treeve Jelbert <treeve AT sourcemage.org>
- * FINAL INSTALL PRE_BUILD: deleted
- * CONFIGURE: added
- * *: use cmake
-
2024-05-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.6.2
* FINAL: tweak, avoid mozilla
diff --git a/archive/xz-utils/INSTALL b/archive/xz-utils/INSTALL
new file mode 100755
index 0000000..c6c05ef
--- /dev/null
+++ b/archive/xz-utils/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+install -v -d "$INSTALL_ROOT"/usr/lib &&
+mv "$INSTALL_ROOT"/lib/liblzma.a "$INSTALL_ROOT"/lib/liblzma.la \
+ "$INSTALL_ROOT"/usr/lib/
diff --git a/archive/xz-utils/PRE_BUILD b/archive/xz-utils/PRE_BUILD
new file mode 100755
index 0000000..4f1adc8
--- /dev/null
+++ b/archive/xz-utils/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches &&
+
+# Install .pc file to correct place
+sed "/pkgconfigdir =/s;= .*$;= ${INSTALL_ROOT}/usr/lib/pkgconfig;" \
+ -i src/liblzma/Makefile.am src/liblzma/Makefile.in


  • [[SM-Commit] ] GIT changes to master grimoire by David C. Haley (e16e875281b22d20b9fcfd1ae7a5b07951c54bfa), David C. Haley, 07/10/2024

Archive powered by MHonArc 2.6.24.

Top of Page