aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-01-28 13:01:46 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-01-28 13:01:46 +0200
commit7e6f6528e8d868853eae2b67183714dfcdc3465c (patch)
tree143b3f8773fa19f415fb2a83d03938555388f7ce /main
parent117d75d7424437c1b3798363c9e87ddfc038a46c (diff)
downloadaports-7e6f6528e8d868853eae2b67183714dfcdc3465c.tar.bz2
aports-7e6f6528e8d868853eae2b67183714dfcdc3465c.tar.xz
main/subversion: fix perl-subversion to actually work
* build, install and package libsvn_swig_perl * remove the cyclic link dependency stuff * add missing libapr-1 to the swig library * clean up rpath for the perl modules
Diffstat (limited to 'main')
-rw-r--r--main/subversion/APKBUILD19
-rw-r--r--main/subversion/subversion-perl-deplibs.patch25
2 files changed, 38 insertions, 6 deletions
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 267fa55974..3ddedc9105 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=subversion
pkgver=1.7.2
-pkgrel=2
+pkgrel=3
pkgdesc="Replacement for CVS, another versioning system (svn)"
url="http://subversion.tigris.org/"
arch="all"
@@ -11,10 +11,11 @@ makedepends="apr-dev apr-util-dev expat-dev neon-dev openssl-dev zlib-dev
e2fsprogs-dev sqlite-dev apache2-dev perl-dev swig
autoconf automake libtool"
install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs mod_dav_svn
- perl-$pkgname:pl"
+subpackages="$pkgname-dev $pkgname-doc mod_dav_svn
+ perl-$pkgname:pl $pkgname-libs"
source="http://apache.uib.no/subversion/subversion-$pkgver.tar.bz2
subversion-1.7.0-deplibs.patch
+ subversion-perl-deplibs.patch
svnserve.confd
svnserve.initd
"
@@ -42,12 +43,17 @@ build() {
make external-all || return 1
make local-all || return 1
- make swig-pl swig-pl-lib || return 1
+
+ make swig-pl-lib || return 1
+ (cd subversion/bindings/swig/perl/native ; perl Makefile.PL) || return 1
+ # need override LD_RUN_PATH with something valid, otherwise we get
+ # empty rpath which is not a good idea.
+ make -C subversion/bindings/swig/perl/native LD_RUN_PATH="/usr/lib" EXTRALIBS="-lapr-1" || return 1
}
package() {
cd "$_builddir"
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" install install-swig-pl-lib || return 1
make pure_vendor_install -C subversion/bindings/swig/perl/native \
PERL_INSTALL_ROOT="$pkgdir" || return 1
rm "$pkgdir"/usr/lib/*.la || return 1
@@ -73,10 +79,11 @@ mod_dav_svn() {
pl() {
pkgdesc="Perl bindings to subversion"
mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/
}
md5sums="1e5dfffd27be080672e5a042564368a8 subversion-1.7.2.tar.bz2
e1127cb722daecb3c89adbaf9eed7adf subversion-1.7.0-deplibs.patch
+cb2697049b57cab4d7d07336c2a339d3 subversion-perl-deplibs.patch
d084a7558053784886bc858b94fa9186 svnserve.confd
bedaa1837021bc7654eae333fa9a21f0 svnserve.initd"
diff --git a/main/subversion/subversion-perl-deplibs.patch b/main/subversion/subversion-perl-deplibs.patch
new file mode 100644
index 0000000000..e9757a2866
--- /dev/null
+++ b/main/subversion/subversion-perl-deplibs.patch
@@ -0,0 +1,25 @@
+--- subversion-1.7.2/subversion/bindings/swig/perl/native/Makefile.PL.in.orig
++++ subversion-1.7.2/subversion/bindings/swig/perl/native/Makefile.PL.in
+@@ -49,11 +49,7 @@
+ my $cflags = '@CFLAGS@';
+ my $apr_cflags = '@SVN_APR_INCLUDES@';
+ my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
+-
+-# According to the log of r7937, the flags guarded by the conditional break
+-# the build on FreeBSD if not conditionalized.
+-my $apr_ldflags = '@SVN_APR_LIBS@'
+- if $^O eq 'darwin' or $^O eq 'cygwin';
++my $apr_ldflags = '@SVN_APR_LIBS@';
+
+ chomp $apr_shlib_path_var;
+
+--- subversion-1.7.2/configure.ac.orig
++++ subversion-1.7.2/configure.ac
+@@ -328,6 +328,6 @@
+ AC_MSG_CHECKING([whether to avoid circular linkage at all costs])
+ case $host in
+- *-*-cygwin*)
++ *linux*)
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1,
+ [Define if circular linkage is not possible on this platform.])