summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul de Vrieze <pauldv@gentoo.org>2004-10-08 11:47:23 +0000
committerPaul de Vrieze <pauldv@gentoo.org>2004-10-08 11:47:23 +0000
commit69c53b026a5e5ac08c90318c2c76b79fd8ee0ec8 (patch)
tree22e4a5bcb198719bfaf0562ec57dd8052597fee8 /dev-util/subversion
parentRemove stale mask (diff)
downloadgentoo-2-69c53b026a5e5ac08c90318c2c76b79fd8ee0ec8.tar.gz
gentoo-2-69c53b026a5e5ac08c90318c2c76b79fd8ee0ec8.tar.bz2
gentoo-2-69c53b026a5e5ac08c90318c2c76b79fd8ee0ec8.zip
Fix javahl linking again
Diffstat (limited to 'dev-util/subversion')
-rw-r--r--dev-util/subversion/ChangeLog5
-rw-r--r--dev-util/subversion/Manifest4
-rw-r--r--dev-util/subversion/files/subversion-1.1.0-rc4-build.patch11
3 files changed, 17 insertions, 3 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index d47204a25bae..c2d1dada52ac 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,9 @@
# 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.105 2004/10/01 12:03:27 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.106 2004/10/08 11:47:23 pauldv Exp $
+
+ 08 Oct 2004; <pauldv@gentoo.org> files/subversion-1.1.0-rc4-build.patch:
+ Fix javahl linking (again) to fix bug #66625, this fix comes from rc2
01 Oct 2004; <pauldv@gentoo.org> -files/subversion-pre-1.0.5.patch,
-subversion-1.0.1.ebuild, -subversion-1.0.2.ebuild,
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 2225d657c96d..9cd2eab2ed2f 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -7,7 +7,7 @@ MD5 949ac57fd20973cb10d0fe938492b109 subversion-1.1.0.ebuild 8807
MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
+MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
MD5 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70
MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70
-MD5 e4bec21be4f4a90d42c9c645077b1a2c files/subversion-1.1.0-rc4-build.patch 545
-MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
+MD5 d0a60a05e109758afcd4b486f66e8bab files/subversion-1.1.0-rc4-build.patch 1316
diff --git a/dev-util/subversion/files/subversion-1.1.0-rc4-build.patch b/dev-util/subversion/files/subversion-1.1.0-rc4-build.patch
index 8c39df49cd70..67be4eda7cad 100644
--- a/dev-util/subversion/files/subversion-1.1.0-rc4-build.patch
+++ b/dev-util/subversion/files/subversion-1.1.0-rc4-build.patch
@@ -13,3 +13,14 @@ diff -urN subversion-1.1.0-rc4.orig/configure.in subversion-1.1.0-rc4/configure.
AC_OUTPUT
+--- subversion-1.1.0.orig/Makefile.in 2004-10-08 13:43:42.856109064 +0200
++++ subversion-1.1.0/Makefile.in 2004-10-08 13:44:05.290698488 +0200
+@@ -178,7 +178,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) $(LT_CXX_LIBADD) -rpath $(libdir)
++LINK_JAVAHL_CXX = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir) -lstdc++
+
+ INSTALL = @INSTALL@
+ INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)