summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-04-20 01:40:49 +0000
committerMike Frysinger <vapier@gentoo.org>2006-04-20 01:40:49 +0000
commita7946b89ba9a64fe38f7d192a5a1e9a85b885798 (patch)
tree84d1b97bca475b6d59fb7bc7b77776fa32e1c43e /sys-fs/xfsprogs
parentRespect user LDFLAGS #126825 by Diego Pettenò. (diff)
downloadhistorical-a7946b89ba9a64fe38f7d192a5a1e9a85b885798.tar.gz
historical-a7946b89ba9a64fe38f7d192a5a1e9a85b885798.tar.bz2
historical-a7946b89ba9a64fe38f7d192a5a1e9a85b885798.zip
Respect user LDFLAGS #126825 by Diego Pettenò.
Package-Manager: portage-2.1_pre9
Diffstat (limited to 'sys-fs/xfsprogs')
-rw-r--r--sys-fs/xfsprogs/ChangeLog6
-rw-r--r--sys-fs/xfsprogs/files/xfsprogs-2.7.11-LDFLAGS.patch26
-rw-r--r--sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild4
3 files changed, 33 insertions, 3 deletions
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 393e9d45580a..e3a201b4a13b 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/xfsprogs
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.45 2006/04/10 23:02:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.46 2006/04/20 01:38:56 vapier Exp $
+
+ 20 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/xfsprogs-2.7.11-LDFLAGS.patch, xfsprogs-2.7.11.ebuild:
+ Respect user LDFLAGS #126825 by Diego Pettenò.
10 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+files/xfsprogs-2.7.11-no-compress-docs.patch, xfsprogs-2.7.11.ebuild:
diff --git a/sys-fs/xfsprogs/files/xfsprogs-2.7.11-LDFLAGS.patch b/sys-fs/xfsprogs/files/xfsprogs-2.7.11-LDFLAGS.patch
new file mode 100644
index 000000000000..9ed5d29bbf2f
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-2.7.11-LDFLAGS.patch
@@ -0,0 +1,26 @@
+Respect user LDFLAGS
+
+http://bugs.gentoo.org/126825
+
+--- include/buildmacros
++++ include/buildmacros
+@@ -9,7 +9,8 @@
+ # $(CXXFILES), or $(HFILES) and is used to construct the manifest list
+ # during the "dist" phase (packaging).
+
+-LDFLAGS = $(LLDFLAGS)
++LDFLAGS += $(LDFLAGS_OPT) $(LLDFLAGS)
++LTLDFLAGS += $(LDFLAGS_OPT)
+ LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
+
+ MAKEOPTS = --no-print-directory
+--- include/builddefs.in
++++ include/builddefs.in
+@@ -9,6 +9,7 @@
+
+ DEBUG = @debug_build@
+ OPTIMIZER = @opt_build@
++LDFLAGS_OPT = @LDFLAGS@
+ MALLOCLIB = @malloc_lib@
+
+ LIBATTR = $(TOPDIR)/libattr/libattr.la
diff --git a/sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild b/sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild
index 8e7de199ffa9..3a28c8fce232 100644
--- a/sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild,v 1.2 2006/04/10 23:02:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-2.7.11.ebuild,v 1.3 2006/04/20 01:38:56 vapier Exp $
inherit flag-o-matic eutils
@@ -20,8 +20,8 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
cd "${S}"
-
epatch "${FILESDIR}"/${P}-no-compress-docs.patch #129486
+ epatch "${FILESDIR}"/${P}-LDFLAGS.patch #126825
# Inject our own CFLAGS / docpath
sed -i \
-e '/^GCFLAGS/s:-O1::' \