diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-20 11:19:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-20 11:33:27 +0000 |
| commit | 75d84dac34afb24668c5cd228d65488982a246e6 (patch) | |
| tree | be79a83a8b2074a9e061b58148d6856bac9654a0 /main/subversion | |
| parent | 1bb0380a593c03b9cd879b1e86950c3e2dab154d (diff) | |
| download | aports-75d84dac34afb24668c5cd228d65488982a246e6.tar.bz2 aports-75d84dac34afb24668c5cd228d65488982a246e6.tar.xz | |
main/subversion: unset CPPFLAGS for swig
this fixes build on arm
Diffstat (limited to 'main/subversion')
| -rw-r--r-- | main/subversion/APKBUILD | 7 | ||||
| -rw-r--r-- | main/subversion/subversion-python-swig.patch | 11 |
2 files changed, 2 insertions, 16 deletions
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index e3e0fa8eee..6ae00b2146 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion pkgver=1.9.4 -pkgrel=1 +pkgrel=2 pkgdesc="Replacement for CVS, another versioning system (svn)" url="http://subversion.tigris.org/" arch="all" @@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc mod_dav_svn source="http://archive.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2 subversion-1.7.0-deplibs.patch subversion-perl-deplibs.patch - subversion-python-swig.patch svnserve.confd svnserve.initd " @@ -31,6 +30,7 @@ prepare() { build() { cd "$_builddir" + unset CPPFLAGS ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -93,18 +93,15 @@ py() { md5sums="29121a038f87641055a8183f49e9739f subversion-1.9.4.tar.bz2 e1127cb722daecb3c89adbaf9eed7adf subversion-1.7.0-deplibs.patch 39dd787af4f9ca05ab85ce94f4471687 subversion-perl-deplibs.patch -99d8e39c4cd5e8fb16621aed8dd854ce subversion-python-swig.patch d084a7558053784886bc858b94fa9186 svnserve.confd 5f8f894631143c5da874bfb6917f2e07 svnserve.initd" sha256sums="1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299 subversion-1.9.4.tar.bz2 0259a605a62e7a7fe128ee3bfa1264421e4a4ebc66e35c666b59cac97471f5b7 subversion-1.7.0-deplibs.patch da9cb4a1cf95b15088ab6612691f96b1ab338056843c22b5997238f0aaf2b38f subversion-perl-deplibs.patch -6e3787157563c4e8685be117f87e5c3512a6855f2868f9086bfc43d670abe0f6 subversion-python-swig.patch c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00 svnserve.confd ac8496caaf90628673b2e46f02e8f67ba7bd7ae7347758c5b91cd4f25f3f2f3f svnserve.initd" sha512sums="fa512d8315dd6a435dcc5a3c2ca3cd7cf932364dd3a82063be868aa3ebcc04caf87cd3ff732d3e3d8aec86f3f58848e2b55987451d4697479bb151d1269db07f subversion-1.9.4.tar.bz2 fb219c45b80602d919176cc191394df09f90d0f5c7d24e6a36b166bd92777ecae67eeac1e49c0ffbb0e724396b3d2094dbb0bef17d01dc87d418b1cd554bd7c4 subversion-1.7.0-deplibs.patch fd6e5f45cff4d3cf0d885a34c822b32141b13b199d99ad8e1b04d641c9c1ee27e73f5c556a4ad54a900b6d39cc14afad17b6738d8af44c76758f1a27b4d49f9a subversion-perl-deplibs.patch -4ff2dd7f53fe4a49fa29df5e06cc5138e7d626c97fdde9099fcf22d8d0a6019095fcea856531bfe3b2ac9bb737185a285248642d6114d7778d9c2045029239d9 subversion-python-swig.patch 7fe993443d4d3ef5e1e75f60e85036ee0b2bb2636c2c830210e64f525f95ae4c10ca1dc4504fc36915ec9391815becbe7cbf5f589c28609386d8d079ed02c630 svnserve.confd f6392193cc65aaceee9b6e5e66f80af4b095ba4007e8536e8b1c4e8b2c75610d7f5596b83e5edd504672f021c074887fc6464cf4fc1dfe9446741105f11cd855 svnserve.initd" diff --git a/main/subversion/subversion-python-swig.patch b/main/subversion/subversion-python-swig.patch deleted file mode 100644 index dc24b91ce5..0000000000 --- a/main/subversion/subversion-python-swig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1504,6 +1504,8 @@ - # Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well. - SWIG_CPPFLAGS="$CPPFLAGS" - SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ]) -+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-Os ]) -+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-fomit-frame-pointer ]) - AC_SUBST([SWIG_CPPFLAGS]) - - dnl Since this is used only on Unix-y systems, define the path separator as '/' |