sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (bbee6ad9744959c0c38f4d6f1455bfe141821797)
- 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 (bbee6ad9744959c0c38f4d6f1455bfe141821797)
- Date: Wed, 22 Jan 2025 23:02:58 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
libs/libxml2/BUILD | 1 +
libs/libxml2/CONFIGURE | 11 +++++++++++
libs/libxml2/HISTORY | 2 ++
libs/libxml2/PRE_SUB_DEPENDS | 8 +++++---
libs/libxml2/SUB_DEPENDS | 12 ++++++++++--
libs/raptor/DEPENDS | 2 +-
libs/raptor/DETAILS | 2 +-
libs/raptor/HISTORY | 5 +++++
libs/raptor/PRE_BUILD | 5 +----
9 files changed, 37 insertions(+), 11 deletions(-)
New commits:
commit bbee6ad9744959c0c38f4d6f1455bfe141821797
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
raptor: PATCHLEVEL++
commit 74423e99bb4b9179c692bd12593c6527731e718f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
raptor: Remove libtool patching
commit 76294236d542e5fe33573955488485629573e90a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
raptor: depends on libxml2[HTTP]
commit b2fd38ab5b281897bed92290d1cd0dfa12460674
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
libxml2: Add knobs for HTTP and FTP support
diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
index a61c119..1522dfe 100755
--- a/libs/libxml2/BUILD
+++ b/libs/libxml2/BUILD
@@ -1,2 +1,3 @@
+OPTS+=" $LIBXML2_OPTS" &&
export PYTHON="$TRACK_ROOT/usr/bin/python3" &&
default_build
diff --git a/libs/libxml2/CONFIGURE b/libs/libxml2/CONFIGURE
new file mode 100755
index 0000000..15a1c67
--- /dev/null
+++ b/libs/libxml2/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option LIBXML2_OPTS \
+ 'enable FTP support' \
+ n \
+ --with-ftp \
+ --without-ftp &&
+
+config_query_option LIBXML2_OPTS \
+ 'enable HTTP support' \
+ n \
+ --with-http \
+ --without-http
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 8e94b2a..ac0f9be 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,5 +1,7 @@
2025-01-22 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.13.5
+ * BUILD, CONFIGURE, PRE_SUB_DEPENDS, SUB_DEPENDS:
+ added knobs for HTTP and FTP support
2024-09-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.13.4
diff --git a/libs/libxml2/PRE_SUB_DEPENDS b/libs/libxml2/PRE_SUB_DEPENDS
index 6a32568..05158ec 100755
--- a/libs/libxml2/PRE_SUB_DEPENDS
+++ b/libs/libxml2/PRE_SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
- PYTHON) is_depends_enabled $SPELL python3;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
- return 1;;
+ (HTTP) list_find LIBXML2_OPTS --with-http ;;
+ (FTP) list_find LIBXML2_OPTS --with-ftp ;;
+ (PYTHON) is_depends_enabled $SPELL python3 ;;
+ (*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1 ;;
esac
diff --git a/libs/libxml2/SUB_DEPENDS b/libs/libxml2/SUB_DEPENDS
index 3bd1fdf..5049919 100755
--- a/libs/libxml2/SUB_DEPENDS
+++ b/libs/libxml2/SUB_DEPENDS
@@ -1,6 +1,14 @@
case $THIS_SUB_DEPENDS in
- PYTHON) message "python bindings requested, forcing them" &&
+ (HTTP) message "HTTP support requested, forcing it" &&
+ list_remove LIBXML2_OPTS --without-http &&
+ list_add LIBXML2_OPTS --with-http
+ ;;
+ (FTP) message "FTP support requested, forcing it" &&
+ list_remove LIBXML2_OPTS --without-ftp &&
+ list_add LIBXML2_OPTS --with-ftp
+ ;;
+ (PYTHON) message "python bindings requested, forcing them" &&
depends python3 "--with-python";;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ (*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1;;
esac
diff --git a/libs/raptor/DEPENDS b/libs/raptor/DEPENDS
index 257c88f..6c83c43 100755
--- a/libs/raptor/DEPENDS
+++ b/libs/raptor/DEPENDS
@@ -1,4 +1,4 @@
-depends libxml2 &&
+depends -sub HTTP libxml2 &&
depends libxslt &&
if [ "$RAPTOR_WWWLIB" == "curl" ]; then
diff --git a/libs/raptor/DETAILS b/libs/raptor/DETAILS
index 89576e0..3668260 100755
--- a/libs/raptor/DETAILS
+++ b/libs/raptor/DETAILS
@@ -1,7 +1,7 @@
# Watch: http://download.librdf.org/source/ raptor2-([0-9.]+)\.tar
SPELL=raptor
SPELLX=raptor2
- PATCHLEVEL=1
+ PATCHLEVEL=2
VERSION=2.0.16
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.gz
diff --git a/libs/raptor/HISTORY b/libs/raptor/HISTORY
index 90b2363..05e424a 100644
--- a/libs/raptor/HISTORY
+++ b/libs/raptor/HISTORY
@@ -1,3 +1,8 @@
+2025-01-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: added libxml2[HTTP]
+ * PRE_BUILD: removed libtool patching, not needed anymore
+ * DETAILS: PATCHLEVEL++
+
2024-10-28 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: simplify, fix xmlnano
* patches: fix patch
diff --git a/libs/raptor/PRE_BUILD b/libs/raptor/PRE_BUILD
index 5d38d2c..c230ad1 100755
--- a/libs/raptor/PRE_BUILD
+++ b/libs/raptor/PRE_BUILD
@@ -1,6 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-# disable instalation of libtool pseudo-libraries
-sed -E -i '/^[\t ]*(func_show_|$run )eval "[$]install_prog [$]instname /d' \
- build/ltmain.sh
+apply_patch_dir patches
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (bbee6ad9744959c0c38f4d6f1455bfe141821797), Ismael Luceno, 01/22/2025
Archive powered by MHonArc 2.6.24.