Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (854f6c70ddbafd25221c3f8d542841e3f31d96aa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (854f6c70ddbafd25221c3f8d542841e3f31d96aa)
  • Date: Sun, 6 Apr 2008 22:21:39 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

collab/subversion/BUILD | 12 +++++++++---
collab/subversion/HISTORY | 3 +++
collab/subversion/PRE_BUILD | 16 ++++++++++++++++
collab/subversion/subversion-apr_cppflags.patch | 13 +++++++++++++
4 files changed, 41 insertions(+), 3 deletions(-)

New commits:
commit 854f6c70ddbafd25221c3f8d542841e3f31d96aa
Author: root <root AT athena.dragonboricua.com>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

collab/subversion: fix for #10735 (Perl SWIG bindings compile failure)

diff --git a/collab/subversion/BUILD b/collab/subversion/BUILD
index 848e363..2b97481 100755
--- a/collab/subversion/BUILD
+++ b/collab/subversion/BUILD
@@ -16,12 +16,18 @@ fi &&

if ! [[ -x configure ]]; then ./autogen.sh; fi &&

-
-OPTS="$OPTS --disable-debug --disable-static --disable-mod-activation
--enable-dso --enable-shared --disable-neon-version-check" &&
+CFLAGS="${CFLAGS} $(/usr/bin/apr-1-config --cppflags)" &&
+SWIG_LDFLAGS="${LDFLAGS}" &&
+OPTS="$OPTS --disable-debug --disable-static --disable-mod-activation
--enable-dso --enable-shared --disable-experimental-libtool" &&
make_single &&
default_build &&

-if [[ "$SVN_PERL" == y ]]; then make swig-pl; fi &&
+( make external-all && make LT_LDFLAGS="-L${INSTALL_ROOT}/usr/lib)"
local-all ) &&
+
+if [[ "$SVN_PERL" == y ]]; then
+ mkdir -p
subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
&&
+ make swig-pl
+fi &&
if [[ "$SVN_PYTHON" == y ]]; then make swig-py; fi &&
if [[ "$SVN_RUBY" == y ]]; then make swig-rb; fi &&

diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 45a344e..014c8f1 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2008-04-06 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD, PRE_BUILD: fix for #10735 (Perl SWIG bindings compile
failure)
+
2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on e2fsprogs for libcom_err

diff --git a/collab/subversion/PRE_BUILD b/collab/subversion/PRE_BUILD
new file mode 100755
index 0000000..734edc4
--- /dev/null
+++ b/collab/subversion/PRE_BUILD
@@ -0,0 +1,16 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+# assure we don't use the included libs by accident
+rm -Rf neon apr apr-util &&
+
+# this is one of the lovely fixes for building perl with apr 1.x
+patch -p1 < ${SCRIPT_DIRECTORY}/subversion-apr_cppflags.patch &&
+
+sedit 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo
"exported" \2,' Makefile.in &&
+sedit 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1"/'
configure.in &&
+sedit "s:apr-config:apr-1-config:g" build/ac-macros/{find_,}ap* &&
+sedit "s:apu-config:apu-1-config:g" build/ac-macros/{find_,}ap* &&
+
+autoreconf -v -f &&
+libtoolize -f
diff --git a/collab/subversion/subversion-apr_cppflags.patch
b/collab/subversion/subversion-apr_cppflags.patch
new file mode 100644
index 0000000..c46a251
--- /dev/null
+++ b/collab/subversion/subversion-apr_cppflags.patch
@@ -0,0 +1,13 @@
+Index: subversion-1.4.6/build/ac-macros/apr.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/apr.m4
++++ subversion-1.4.6/build/ac-macros/apr.m4
+@@ -64,7 +64,7 @@ AC_DEFUN(SVN_LIB_APR,
+ AC_MSG_ERROR([apr-config --ldflags failed])
+ fi
+
+- SVN_APR_INCLUDES="`$apr_config --includes`"
++ SVN_APR_INCLUDES="`$apr_config --includes --cppflags`"
+ if test $? -ne 0; then
+ AC_MSG_ERROR([apr-config --includes failed])
+ fi



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (854f6c70ddbafd25221c3f8d542841e3f31d96aa), Elisamuel Resto, 04/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page