Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Arwed v. Merkatz
  • Date: Sat, 6 May 2006 05:06:29 -0500

GIT changes to test grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

libs/libxml2/HISTORY | 5 +++++
libs/libxml2/PRE_BUILD | 4 ++++
libs/libxml2/SUB_DEPENDS | 2 +-
libs/libxml2/python-fix.patch | 22 ++++++++++++++++++++++
4 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 758ab8c9d960b562336a87837529d9b224198051
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

Bring back python-fix.patch in a simpler form, add --with-python
configure flag
in SUB_DEPENDS

diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 73b0e26..9274a93 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,8 @@
+2006-06-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, python-fix.patch: brought back a simpler patch as it's
+ required to build with --with-python
+ * SUB_DEPENDS: add --with-python to the forced python dependency
+
2006-05-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, python-fix.patch: removed, breaks the compile

diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
new file mode 100755
index 0000000..ec619ed
--- /dev/null
+++ b/libs/libxml2/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/python-fix.patch
diff --git a/libs/libxml2/SUB_DEPENDS b/libs/libxml2/SUB_DEPENDS
index a498ccb..507288c 100755
--- a/libs/libxml2/SUB_DEPENDS
+++ b/libs/libxml2/SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
-python) echo "python bindings requested, forcing them."; depends python;;
+python) echo "python bindings requested, forcing them."; depends python
'--with-python';;
*) echo "unknown sub-depends!"; return 1;;
esac
diff --git a/libs/libxml2/python-fix.patch b/libs/libxml2/python-fix.patch
new file mode 100644
index 0000000..f1ad82e
--- /dev/null
+++ b/libs/libxml2/python-fix.patch
@@ -0,0 +1,22 @@
+--- configure.in~ 2006-04-28 18:21:20.000000000 +0200
++++ configure.in 2006-05-06 10:31:30.000000000 +0200
+@@ -701,7 +701,7 @@
+ fi
+ if test "$with_python" != ""
+ then
+- pythondir=$(PYTHON_SITE_PACKAGES)
++ pythondir=$PYTHON_SITE_PACKAGES
+ else
+ pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+ fi
+--- configure~ 2006-05-06 10:31:56.000000000 +0200
++++ configure 2006-05-06 10:32:03.000000000 +0200
+@@ -26958,7 +26958,7 @@
+ fi
+ if test "$with_python" != ""
+ then
+- pythondir=$(PYTHON_SITE_PACKAGES)
++ pythondir=$PYTHON_SITE_PACKAGES
+ else
+ pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+ fi




Archive powered by MHonArc 2.6.24.

Top of Page