Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (7ac2377de473804c7b745f36403fc34bd1a7b824)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <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 Treeve Jelbert (7ac2377de473804c7b745f36403fc34bd1a7b824)
  • Date: Tue, 25 Jun 2024 15:26:47 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

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, 11 insertions(+), 19 deletions(-)

New commits:
commit 7ac2377de473804c7b745f36403fc34bd1a7b824
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xz-utils - cmake build'

diff --git a/archive/xz-utils/BUILD b/archive/xz-utils/BUILD
index 01d506a..d215285 100755
--- a/archive/xz-utils/BUILD
+++ b/archive/xz-utils/BUILD
@@ -1,3 +1,2 @@
-OPTS+=" --exec-prefix=${INSTALL_ROOT}" &&
-
+OPTS+=" -DBUILD_SHARED_LIBS=1" &&
default_build
diff --git a/archive/xz-utils/CONFIGURE b/archive/xz-utils/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/archive/xz-utils/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/archive/xz-utils/DEPENDS b/archive/xz-utils/DEPENDS
index c1d2655..b476b5e 100755
--- a/archive/xz-utils/DEPENDS
+++ b/archive/xz-utils/DEPENDS
@@ -1,4 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
optional_depends GETTEXT \
- "--enable-nls" \
- "--disable-nls" \
+ " -DENABLE_NLS=1" \
+ " -DENABLE_NLS=0" \
"for Native Language Support"
diff --git a/archive/xz-utils/DETAILS b/archive/xz-utils/DETAILS
index e55d945..6be93fa 100755
--- a/archive/xz-utils/DETAILS
+++ b/archive/xz-utils/DETAILS
@@ -1,3 +1,4 @@
+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
deleted file mode 100755
index ec3888c..0000000
--- a/archive/xz-utils/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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 0fbb95b..72339ba 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,8 @@
+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
deleted file mode 100755
index c6c05ef..0000000
--- a/archive/xz-utils/INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 4f1adc8..0000000
--- a/archive/xz-utils/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-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 Treeve Jelbert (7ac2377de473804c7b745f36403fc34bd1a7b824), Treeve Jelbert, 06/25/2024

Archive powered by MHonArc 2.6.24.

Top of Page