diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2004-08-30 10:39:48 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2004-08-30 10:39:48 +0000 |
| commit | 782ed0a16df2ff0f08cdc8bfca720334ae07b959 (patch) | |
| tree | 6ff3fc327830713bcd55e8b9cd047747e7e796fb /dev-util | |
| parent | Add ~mips for the XXS1500 unit. (Manifest recommit) (diff) | |
| download | gentoo-2-782ed0a16df2ff0f08cdc8bfca720334ae07b959.tar.gz gentoo-2-782ed0a16df2ff0f08cdc8bfca720334ae07b959.tar.bz2 gentoo-2-782ed0a16df2ff0f08cdc8bfca720334ae07b959.zip | |
Fix a java binding linking error and a variable substitution error
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/subversion/files/subversion-1.1.0-rc2-build.patch | 25 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.1.0_rc2.ebuild | 3 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 61f7d5ad8c98..76f41aa089d4 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.92 2004/08/19 20:43:12 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.93 2004/08/30 10:39:47 pauldv Exp $ + + 30 Aug 2004; <pauldv@gentoo.org> +files/subversion-1.1.0-rc2-build.patch, + subversion-1.1.0_rc2.ebuild: + Fix some java linking error and a variable substitution error. Thanks to + Holger Thon <ht_gentoo04@arcor.de> in bug #59693 *subversion-1.1.0_rc2 (19 Aug 2004) diff --git a/dev-util/subversion/files/subversion-1.1.0-rc2-build.patch b/dev-util/subversion/files/subversion-1.1.0-rc2-build.patch new file mode 100644 index 000000000000..995c26e2e495 --- /dev/null +++ b/dev-util/subversion/files/subversion-1.1.0-rc2-build.patch @@ -0,0 +1,25 @@ +--- subversion-1.1.0-rc2.orig/configure.in 2004-08-10 19:31:57.000000000 +0200 ++++ subversion-1.1.0-rc2/configure.in 2004-08-28 18:48:07.130058136 +0200 +@@ -698,6 +698,11 @@ + SVN_CONFIG_SCRIPT(tools/hook-scripts/propchange-email.pl) + SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL) + ++test -z "$SVN_DB_INCLUDES" && SVN_DB_INCLUDES="" ++AC_SUBST(SVN_DB_INCLUDES) ++test -z "$SVN_DB_LIBS" && SVN_DB_LIBS="" ++AC_SUBST(SVN_DB_LIBS) ++ + AC_OUTPUT + + +--- subversion-1.1.0-rc2.orig/Makefile.in 2004-08-10 18:35:02.000000000 +0200 ++++ subversion-1.1.0-rc2/Makefile.in 2004-08-28 18:56:44.650383088 +0200 +@@ -177,7 +177,7 @@ + LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module + LINK_JAVA_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_JAVA_LINK) $(SWIG_LDFLAGS) -rpath $(swig_javadir) -avoid-version -module + +-LINK_JAVAHL_CXX = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) ++LINK_JAVAHL_CXX = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -lstdc++ + + INSTALL = @INSTALL@ + INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) diff --git a/dev-util/subversion/subversion-1.1.0_rc2.ebuild b/dev-util/subversion/subversion-1.1.0_rc2.ebuild index ff255c844910..ea4f4a04eae8 100644 --- a/dev-util/subversion/subversion-1.1.0_rc2.ebuild +++ b/dev-util/subversion/subversion-1.1.0_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0_rc2.ebuild,v 1.1 2004/08/19 20:43:12 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0_rc2.ebuild,v 1.2 2004/08/30 10:39:47 pauldv Exp $ inherit elisp-common libtool python eutils @@ -79,6 +79,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/subversion-db4.patch + epatch ${FILESDIR}/subversion-1.1.0-rc2-build.patch export WANT_AUTOCONF_2_5=1 elibtoolize |