summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé María Alonso <nimiux@gentoo.org>2012-07-05 10:02:13 +0000
committerJosé María Alonso <nimiux@gentoo.org>2012-07-05 10:02:13 +0000
commit540cf09c1479c721e056f4493260d80eca656f00 (patch)
treef578ed4a59bd5b8e15eeacd2a1e01f9f2c5b9dc4 /app-emulation/free42
parentFix typo in mask (diff)
downloadgentoo-2-540cf09c1479c721e056f4493260d80eca656f00.tar.gz
gentoo-2-540cf09c1479c721e056f4493260d80eca656f00.tar.bz2
gentoo-2-540cf09c1479c721e056f4493260d80eca656f00.zip
Respect LDFLAGS wrt bug #424503.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/free42')
-rw-r--r--app-emulation/free42/ChangeLog5
-rw-r--r--app-emulation/free42/free42-1.4.74.ebuild6
2 files changed, 8 insertions, 3 deletions
diff --git a/app-emulation/free42/ChangeLog b/app-emulation/free42/ChangeLog
index f6327141073a..5ba754f67860 100644
--- a/app-emulation/free42/ChangeLog
+++ b/app-emulation/free42/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/free42
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.3 2012/07/04 17:37:31 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.4 2012/07/05 10:02:13 nimiux Exp $
+
+ 05 Jul 2012; Chema Alonso <nimiux@gentoo.org> free42-1.4.74.ebuild:
+ Respect LDFLAGS wrt bug #424503.
04 Jul 2012; Chema Alonso <nimiux@gentoo.org> free42-1.4.74.ebuild:
Bug #424503: Depend on x11-libs/gtk+:2. Add user CXXFLAGS. Drop -g flag.
diff --git a/app-emulation/free42/free42-1.4.74.ebuild b/app-emulation/free42/free42-1.4.74.ebuild
index dee5e8bff73d..a4fce3cf46ec 100644
--- a/app-emulation/free42/free42-1.4.74.ebuild
+++ b/app-emulation/free42/free42-1.4.74.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.74.ebuild,v 1.3 2012/07/04 17:37:31 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.74.ebuild,v 1.4 2012/07/05 10:02:13 nimiux Exp $
EAPI=4
@@ -28,7 +28,9 @@ S=${WORKDIR}/${PN}
src_prepare() {
sed -i -e '/^CXXFLAGS :=/{s/-g //;s/$/ \$\{CXXFLAGS\}/}' \
"${S}/gtk/Makefile" || die
- sed -i -e 's/-Wl,--hash-style=both/-O1 -Wl,--hash-style=gnu,--as-needed/' \
+ sed -i -e '/^LDFLAGS =/{s/=/:=/;s/$/ \$\{LDFLAGS\}/}' \
+ "${S}/gtk/Makefile" || die
+ sed -i -e 's/-Wl,--hash-style=both/-Wl,--hash-style=gnu/' \
"${S}/gtk/Makefile" || die
}