diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-06 13:31:53 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-06 13:34:41 +0000 |
| commit | 9fc51949df045fdc5444ba4ea739dafca90e99b2 (patch) | |
| tree | 0df55ddb157d03a75169a4d8829f5285c2b72443 /main/subversion | |
| parent | 8e5fd305fdde244ffa5db5eef87b814c5fef25e0 (diff) | |
| download | aports-9fc51949df045fdc5444ba4ea739dafca90e99b2.tar.bz2 aports-9fc51949df045fdc5444ba4ea739dafca90e99b2.tar.xz | |
main/subversion: fix building with new libtool
Diffstat (limited to 'main/subversion')
| -rw-r--r-- | main/subversion/APKBUILD | 8 | ||||
| -rw-r--r-- | main/subversion/autogen.patch | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index 3045e3bf2c..ec9546151d 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.8.10 -pkgrel=0 +pkgrel=1 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" arch="all" @@ -16,6 +16,7 @@ subpackages="$pkgname-dev $pkgname-doc mod_dav_svn source="http://apache.uib.no/subversion/subversion-$pkgver.tar.bz2 subversion-1.7.0-deplibs.patch subversion-perl-deplibs.patch + autogen.patch svnserve.confd svnserve.initd " @@ -28,7 +29,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - ./autogen.sh + LIBTOOL_CONFIG=/usr/share/libtool/build-aux ./autogen.sh } build() { @@ -91,15 +92,18 @@ pl() { md5sums="3068256761b40863df96128834d6b71b subversion-1.8.10.tar.bz2 e1127cb722daecb3c89adbaf9eed7adf subversion-1.7.0-deplibs.patch 39dd787af4f9ca05ab85ce94f4471687 subversion-perl-deplibs.patch +c1d082a04e3c336033d5603b5918b9a1 autogen.patch d084a7558053784886bc858b94fa9186 svnserve.confd bedaa1837021bc7654eae333fa9a21f0 svnserve.initd" sha256sums="1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc subversion-1.8.10.tar.bz2 0259a605a62e7a7fe128ee3bfa1264421e4a4ebc66e35c666b59cac97471f5b7 subversion-1.7.0-deplibs.patch da9cb4a1cf95b15088ab6612691f96b1ab338056843c22b5997238f0aaf2b38f subversion-perl-deplibs.patch +4aa12e1c9b72cff4c505a30472d24e654a537f0425f88825dbc9a2e3a889c8e3 autogen.patch c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00 svnserve.confd 6006058a85cd7d494832075f0f9b881b731089593e0716e13874ff02b7110553 svnserve.initd" sha512sums="a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 subversion-1.8.10.tar.bz2 fb219c45b80602d919176cc191394df09f90d0f5c7d24e6a36b166bd92777ecae67eeac1e49c0ffbb0e724396b3d2094dbb0bef17d01dc87d418b1cd554bd7c4 subversion-1.7.0-deplibs.patch fd6e5f45cff4d3cf0d885a34c822b32141b13b199d99ad8e1b04d641c9c1ee27e73f5c556a4ad54a900b6d39cc14afad17b6738d8af44c76758f1a27b4d49f9a subversion-perl-deplibs.patch +d8f451d20b371e7621432641a7e644a6b46f4149f4afbca405915c97f326c387ff916b65d296b0e9033eaed7952f865067c60abbc61e1041097afc25854110ab autogen.patch 7fe993443d4d3ef5e1e75f60e85036ee0b2bb2636c2c830210e64f525f95ae4c10ca1dc4504fc36915ec9391815becbe7cbf5f589c28609386d8d079ed02c630 svnserve.confd 28e674b2ce62e117b9b072545610f872f2722d878a46cb1d267908d0ec565e38e1bcc53b7fbd95d7078e97f5e51be601dd0378f7fe4387ce564616199ee2daf9 svnserve.initd" diff --git a/main/subversion/autogen.patch b/main/subversion/autogen.patch new file mode 100644 index 0000000000..13b772d869 --- /dev/null +++ b/main/subversion/autogen.patch @@ -0,0 +1,11 @@ +--- ./autogen.sh.orig ++++ ./autogen.sh +@@ -105,7 +105,7 @@ + + if [ $lt_major_version -ge 2 ]; then + for file in config.guess config.sub; do +- configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file} ++ configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`}/$file + + if [ ! -f $configfile ]; then + echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)" |