summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2012-06-14 06:02:48 +0000
committerNaohiro Aota <naota@gentoo.org>2012-06-14 06:02:48 +0000
commitda2237880b90fc38f6ab7cfd8d8819e95eff7e51 (patch)
tree3b65fe84d092cff68179959db535b6f327f8d35d /app-i18n/libtabe
parentmarked x86 per bug 397603 (diff)
downloadgentoo-2-da2237880b90fc38f6ab7cfd8d8819e95eff7e51.tar.gz
gentoo-2-da2237880b90fc38f6ab7cfd8d8819e95eff7e51.tar.bz2
gentoo-2-da2237880b90fc38f6ab7cfd8d8819e95eff7e51.zip
Add patch to handle LDFLAGS properly.
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/libtabe')
-rw-r--r--app-i18n/libtabe/ChangeLog8
-rw-r--r--app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch57
-rw-r--r--app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild7
3 files changed, 68 insertions, 4 deletions
diff --git a/app-i18n/libtabe/ChangeLog b/app-i18n/libtabe/ChangeLog
index 6a7f93e93fa8..c4a5f7064d55 100644
--- a/app-i18n/libtabe/ChangeLog
+++ b/app-i18n/libtabe/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/libtabe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/ChangeLog,v 1.14 2009/06/02 09:38:54 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/ChangeLog,v 1.15 2012/06/14 06:02:48 naota Exp $
+
+ 14 Jun 2012; Naohiro Aota <naota@gentoo.org>
+ +files/libtabe-0.2.6-ldflags.patch, libtabe-0.2.6.1.2.ebuild:
+ Add patch to handle LDFLAGS properly.
*libtabe-0.2.6.1.2 (02 Jun 2009)
diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
new file mode 100644
index 000000000000..0f51b19b71f2
--- /dev/null
+++ b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
@@ -0,0 +1,57 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index ada3dca..6acd71c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
+ RANLIB = @RANLIB@
+ LN_S = @LN_S@
+-LDFLAGS = @with_db_lib@
++LDFLAGS = @with_db_lib@ @LDFLAGS@
+ INC = @with_db_inc@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -55,7 +55,7 @@ all: $(LIBNAME) @build_supports@
+
+ $(LIBNAME): $(LIBOBJS)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
+
+ bims:
+ (cd supports/bims; $(MAKE))
+diff --git a/src/supports/bims/Makefile.in b/src/supports/bims/Makefile.in
+index dc2534d..0e3041b 100644
+--- a/src/supports/bims/Makefile.in
++++ b/src/supports/bims/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
+ RANLIB = @RANLIB@
+ LN_S = @LN_S@
+-LDFLAGS = @with_db_lib@
++LDFLAGS = @with_db_lib@ @LDFLAGS@
+ INC = -I../..
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -45,7 +45,7 @@ all: $(LIBNAME)
+
+ $(LIBNAME): $(LIBOBJS)
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
+
+ bims.lo: bims.c bims.h
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
+diff --git a/util/Makefile.in b/util/Makefile.in
+index cb82736..16425d1 100644
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
+ RANLIB = @RANLIB@
+ LN_S = @LN_S@
+-LDFLAGS = ../src/libtabe.la @with_db_lib@
++LDFLAGS = ../src/libtabe.la @with_db_lib@ @LDFLAGS@
+ INC = -I../src @with_db_inc@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
index 687adc2170f6..881dbee510cd 100644
--- a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
+++ b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild,v 1.1 2009/06/02 09:38:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild,v 1.2 2012/06/14 06:02:48 naota Exp $
+
+WANT_AUTOMAKE=1.11
inherit eutils libtool autotools multilib versionator
@@ -29,6 +31,7 @@ src_unpack() {
cd "${S}"
epatch "${WORKDIR}"/${DEBIAN_PATCH}
epatch "${FILESDIR}"/${ORIG_P}-fabs.patch
+ epatch "${FILESDIR}"/${ORIG_P}-ldflags.patch
ln -s script/configure.in . || die
eautoreconf