From fec63483b9f32d5b55a76192a67721971aad9cbf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 May 2003 11:59:47 +0000 Subject: [PATCH] * Subversion is also dependant on libxml. svn path=/nixpkgs/trunk/; revision=67 --- build/libxml2-build.sh | 12 ++++++++++++ build/subversion-build.sh | 2 +- descriptors/libxml2-2.5.7.fix | 8 ++++++++ descriptors/subversion-0.23.0.fix | 2 ++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 build/libxml2-build.sh create mode 100644 descriptors/libxml2-2.5.7.fix diff --git a/build/libxml2-build.sh b/build/libxml2-build.sh new file mode 100755 index 00000000000..b511080905f --- /dev/null +++ b/build/libxml2-build.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +export PATH=/bin:/usr/bin + +top=`pwd` +tar xvfz $src || exit 1 +cd libxml2-* || exit 1 +./configure --prefix=$top || exit 1 +make || exit 1 +make install || exit 1 +cd .. || exit 1 +rm -rf libxml2-* || exit 1 diff --git a/build/subversion-build.sh b/build/subversion-build.sh index 3d1922c98ad..3cd17ab98fa 100755 --- a/build/subversion-build.sh +++ b/build/subversion-build.sh @@ -1,6 +1,6 @@ #! /bin/sh -export PATH=/bin:/usr/bin +export PATH=$libxml/bin:/bin:/usr/bin export LDFLAGS=-s diff --git a/descriptors/libxml2-2.5.7.fix b/descriptors/libxml2-2.5.7.fix new file mode 100644 index 00000000000..514482aa782 --- /dev/null +++ b/descriptors/libxml2-2.5.7.fix @@ -0,0 +1,8 @@ +Descr( + [ Bind("pkgId", "libxml2-2.5.7") + , Bind("releaseId", "1") + + , Bind("src", Url("f7ed96959fbddf366af64652804d1b57", "ftp://fr.rpmfind.net/pub/libxml/libxml2-2.5.7.tar.gz")) + , Bind("build", Local("../build/libxml2-build.sh")) + ] +) diff --git a/descriptors/subversion-0.23.0.fix b/descriptors/subversion-0.23.0.fix index 609e7215273..a83e5aa9a3a 100644 --- a/descriptors/subversion-0.23.0.fix +++ b/descriptors/subversion-0.23.0.fix @@ -10,6 +10,8 @@ Descr( , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), "")) + , Bind("libxml", Fix("./libxml2-2.5.7.fix")) + , Bind("src", Url("59661f2145976437b371a0ab3a555dbd", "http://subversion.tigris.org/files/documents/15/4218/subversion-0.23.0.tar.gz")) , Bind("build", Local("../build/subversion-build.sh")) ]