diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-07-29 09:33:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-07-29 09:33:51 +0000 |
| commit | 56b6695f3df466c6d3aa026e57e3c59ca1f2424e (patch) | |
| tree | fb84d98914101776301271de295edb0613104b9e /main | |
| parent | 3afaf78aed57cbe6b81056d907a99ba252cb5ca4 (diff) | |
| download | aports-56b6695f3df466c6d3aa026e57e3c59ca1f2424e.tar.bz2 aports-56b6695f3df466c6d3aa026e57e3c59ca1f2424e.tar.xz | |
main/subversion: fix linking of libaprutil
Diffstat (limited to 'main')
| -rw-r--r-- | main/subversion/APKBUILD | 17 | ||||
| -rw-r--r-- | main/subversion/subversion-1.6.0-deplibs.patch | 30 |
2 files changed, 45 insertions, 2 deletions
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index b25d79523..1581aa764 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,23 +1,35 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.6.17 -pkgrel=3 +pkgrel=4 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" arch="all" license="apache bsd" depends= makedepends="apr-dev apr-util-dev expat-dev neon-dev openssl-dev zlib-dev - e2fsprogs-dev sqlite-dev apache2-dev perl-dev swig" + 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" source="http://subversion.tigris.org/downloads/subversion-$pkgver.tar.bz2 + subversion-1.6.0-deplibs.patch svnserve.confd svnserve.initd " _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + ./autogen.sh +} + build() { cd "$_builddir" ./configure --prefix=/usr \ @@ -65,5 +77,6 @@ pl() { } md5sums="81e5dc5beee4b3fc025ac70c0b6caa14 subversion-1.6.17.tar.bz2 +f1ebbdcd51671f5394dca0e8489d088c subversion-1.6.0-deplibs.patch d084a7558053784886bc858b94fa9186 svnserve.confd 22c274fafb4817e31126f60f9d84039f svnserve.initd" diff --git a/main/subversion/subversion-1.6.0-deplibs.patch b/main/subversion/subversion-1.6.0-deplibs.patch new file mode 100644 index 000000000..d892a7b24 --- /dev/null +++ b/main/subversion/subversion-1.6.0-deplibs.patch @@ -0,0 +1,30 @@ +--- subversion-1.6.0/build/ac-macros/apr.m4.deplibs ++++ subversion-1.6.0/build/ac-macros/apr.m4 +@@ -76,9 +76,9 @@ AC_DEFUN(SVN_LIB_APR, + + dnl When APR stores the dependent libs in the .la file, we don't need + dnl --libs. +- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" ++ SVN_APR_LIBS="`$apr_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apr-config --link-libtool failed]) + fi + + SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" +--- subversion-1.6.0/build/ac-macros/aprutil.m4.deplibs ++++ subversion-1.6.0/build/ac-macros/aprutil.m4 +@@ -77,11 +77,9 @@ AC_DEFUN(SVN_LIB_APRUTIL, + AC_MSG_ERROR([apu-config --prefix failed]) + fi + +- dnl When APR stores the dependent libs in the .la file, we don't need +- dnl --libs. +- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" ++ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" + if test $? -ne 0; then +- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) ++ AC_MSG_ERROR([apu-config --link-libtool failed]) + fi + + SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" |