diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2003-06-26 20:08:06 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2003-06-26 20:08:06 +0000 |
| commit | 63942758675140745cd87c8e7c6b719aee984cea (patch) | |
| tree | 8c337ffefd8d77162c2071bbc51071101c818133 /dev-util | |
| parent | avoid compile fail from dev-libs/libiconv (diff) | |
| download | historical-63942758675140745cd87c8e7c6b719aee984cea.tar.gz historical-63942758675140745cd87c8e7c6b719aee984cea.tar.bz2 historical-63942758675140745cd87c8e7c6b719aee984cea.zip | |
Fixed a compilation bug in "without apache2" mode
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/subversion/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-0.24.1.ebuild | 13 |
3 files changed, 18 insertions, 5 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 983197e71b00..2a5842c7a721 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.22 2003/06/19 17:58:37 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.23 2003/06/26 20:07:58 pauldv Exp $ + + 26 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.24.1.ebuild: + Fixed an issue with a compilation failure together with the included libapr. + #23307 19 Jun 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.24.1.ebuild: Add a comment concerning rebuilding the repository with an upgrade of the db diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 115600bb1786..be1ab7f8485b 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,6 +1,6 @@ MD5 a343df53435bdcfc3a4c85f3e9912102 subversion-0.10_pre1.ebuild 8054 -MD5 23c20e221b9524de1db5cf8012c0138e ChangeLog 3565 -MD5 e7fc0becc906320e1c4e2cf5e6606c36 subversion-0.24.1.ebuild 7185 +MD5 b1d9e7547b2bb7dd2c9401bb6a74bdf0 ChangeLog 3730 +MD5 aadc00c411e4f3f2c1327f777ad9b396 subversion-0.24.1.ebuild 7471 MD5 d88c10d1a71e1912fb8f47491e3ae05b subversion-0.21.0-r1.ebuild 5784 MD5 7a45c9dae1829ed6fa2b22ead64c4eab subversion-0.21.0.ebuild 6494 MD5 61e052a1c91f8ba072d291fb658cae9e subversion-0.22.2.ebuild 6852 diff --git a/dev-util/subversion/subversion-0.24.1.ebuild b/dev-util/subversion/subversion-0.24.1.ebuild index bda54d530bef..f13dc4d23300 100644 --- a/dev-util/subversion/subversion-0.24.1.ebuild +++ b/dev-util/subversion/subversion-0.24.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.24.1.ebuild,v 1.3 2003/06/25 07:59:10 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.24.1.ebuild,v 1.4 2003/06/26 20:07:58 pauldv Exp $ inherit libtool @@ -106,8 +106,17 @@ EOF --with-neon=/usr \ --disable-experimental-libtool \ --disable-mod-activation ||die "configuration failed" + + # build subversion, but do it in a way that is safe for paralel builds - ( emake LT_LDFLAGS="-L${D}/usr/lib" external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed" + # Also apparently the included apr does have a libtool that doesn't like + # -L flags. So not specifying it at all when not building apache modules + # and only specify it for internal parts otherwise + if use apache2; then + ( emake external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed" + else + ( emake external-all && emake local-all ) || die "make of subversion failed" + fi #building fails without the apache apr-util as includes are wrong. #Also the python bindings do not work without db installed |