From a99164d464aa7685d50018fd2d5db438604881de Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 20 Apr 2006 01:41:55 +0000 Subject: Respect user LDFLAGS #126825 by Diego Pettenò. (Portage version: 2.1_pre9) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/dmapi/ChangeLog | 6 +++++- sys-apps/dmapi/dmapi-2.2.3.ebuild | 3 ++- sys-apps/dmapi/files/dmapi-2.2.3-LDFLAGS.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 sys-apps/dmapi/files/dmapi-2.2.3-LDFLAGS.patch (limited to 'sys-apps/dmapi') diff --git a/sys-apps/dmapi/ChangeLog b/sys-apps/dmapi/ChangeLog index e54ce86fd548..cf9045b31ca4 100644 --- a/sys-apps/dmapi/ChangeLog +++ b/sys-apps/dmapi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/dmapi # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.29 2006/02/20 00:35:57 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/ChangeLog,v 1.30 2006/04/20 01:41:55 vapier Exp $ + + 20 Apr 2006; Mike Frysinger + +files/dmapi-2.2.3-LDFLAGS.patch, dmapi-2.2.3.ebuild: + Respect user LDFLAGS #126825 by Diego Pettenò. 20 Feb 2006; Joshua Kinard dmapi-2.2.1.ebuild: Marked stable on mips. diff --git a/sys-apps/dmapi/dmapi-2.2.3.ebuild b/sys-apps/dmapi/dmapi-2.2.3.ebuild index 90c501940db5..b1f2618d2878 100644 --- a/sys-apps/dmapi/dmapi-2.2.3.ebuild +++ b/sys-apps/dmapi/dmapi-2.2.3.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-apps/dmapi/dmapi-2.2.3.ebuild,v 1.1 2006/01/27 00:57:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dmapi/dmapi-2.2.3.ebuild,v 1.2 2006/04/20 01:41:55 vapier Exp $ inherit eutils @@ -19,6 +19,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PN}-2.2.1-only-symlink-when-needed.patch + epatch "${FILESDIR}"/${P}-LDFLAGS.patch #126825 sed -i \ -e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \ include/builddefs.in \ diff --git a/sys-apps/dmapi/files/dmapi-2.2.3-LDFLAGS.patch b/sys-apps/dmapi/files/dmapi-2.2.3-LDFLAGS.patch new file mode 100644 index 000000000000..9ed5d29bbf2f --- /dev/null +++ b/sys-apps/dmapi/files/dmapi-2.2.3-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 -- cgit v1.2.3-65-gdbad