summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2009-12-23 09:05:34 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2009-12-23 09:05:34 +0000
commitcc6371c433553c1f4c0ceafe55d37d18d3305a0c (patch)
tree11013d8a06851f935b78c67095f87b4bdcf20d23 /app-admin/fsvs
parentVersion bump. (diff)
downloadgentoo-2-cc6371c433553c1f4c0ceafe55d37d18d3305a0c.tar.gz
gentoo-2-cc6371c433553c1f4c0ceafe55d37d18d3305a0c.tar.bz2
gentoo-2-cc6371c433553c1f4c0ceafe55d37d18d3305a0c.zip
Fix for forced as-needed, patch by Kacper Kowalik (#294834)
(Portage version: 2.2_rc58/cvs/Linux i686)
Diffstat (limited to 'app-admin/fsvs')
-rw-r--r--app-admin/fsvs/ChangeLog6
-rw-r--r--app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch20
-rw-r--r--app-admin/fsvs/fsvs-1.2.1.ebuild10
3 files changed, 34 insertions, 2 deletions
diff --git a/app-admin/fsvs/ChangeLog b/app-admin/fsvs/ChangeLog
index 0074e5d5da4f..66c93d7e0372 100644
--- a/app-admin/fsvs/ChangeLog
+++ b/app-admin/fsvs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/fsvs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/ChangeLog,v 1.1 2009/10/27 19:04:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/ChangeLog,v 1.2 2009/12/23 09:05:33 dertobi123 Exp $
+
+ 23 Dec 2009; Tobias Scherbaum <dertobi123@gentoo.org> fsvs-1.2.1.ebuild,
+ +files/fsvs-1.2.1-as-needed.patch:
+ Fix for forced as-needed, patch by Kacper Kowalik (#294834)
*fsvs-1.2.1 (27 Oct 2009)
diff --git a/app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch
new file mode 100644
index 000000000000..28be2dcdcdf4
--- /dev/null
+++ b/app-admin/fsvs/files/fsvs-1.2.1-as-needed.patch
@@ -0,0 +1,20 @@
+--- fsvs-1.2.1.orig/src/Makefile.in 2009-10-12 19:05:54.000000000 +0000
++++ fsvs-1.2.1/src/Makefile.in 2009-12-22 16:30:07.057583489 +0000
+@@ -18,7 +18,7 @@
+ CFLAGS := @CFLAGS@
+ CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
+ LDFLAGS := @LDFLAGS@
+-FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm
++FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm
+ EXTRALIBS := @EXTRALIBS@
+ WAA_CHARS?= @WAA_WC_MD5_CHARS@
+
+@@ -152,7 +152,7 @@
+ # change, too.
+ $(DEST): $(C_FILES:%.c=%.o)
+ @echo " Link $@"
+- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS)
+ ifeq (@ENABLE_RELEASE@, 1)
+ -strip $@
+ endif
diff --git a/app-admin/fsvs/fsvs-1.2.1.ebuild b/app-admin/fsvs/fsvs-1.2.1.ebuild
index 072d1685606e..ee25a943c855 100644
--- a/app-admin/fsvs/fsvs-1.2.1.ebuild
+++ b/app-admin/fsvs/fsvs-1.2.1.ebuild
@@ -1,6 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/fsvs-1.2.1.ebuild,v 1.1 2009/10/27 19:04:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fsvs/fsvs-1.2.1.ebuild,v 1.2 2009/12/23 09:05:33 dertobi123 Exp $
+
+EAPI=2
+
+inherit eutils
DESCRIPTION="Backup/restore for subversion backends"
HOMEPAGE="http://fsvs.tigris.org/"
@@ -18,6 +22,10 @@ DEPEND=">=dev-util/subversion-1.2
dev-util/ctags"
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/fsvs-1.2.1-as-needed.patch"
+}
+
src_install() {
dobin src/fsvs
dodir /etc/fsvs