diff options
| author |   José María Alonso <nimiux@gentoo.org> | 2012-07-04 17:37:31 +0000 |
|---|---|---|
| committer | José María Alonso <nimiux@gentoo.org> | 2012-07-04 17:37:31 +0000 |
| commit | 6edb7d93d41069097517ad408767d62e41e50099 (patch) | |
| tree | aed5f2eccff7f2e39c50b14146097f1ebd567553 /app-emulation | |
| parent | Fix the libnl depend to match how 0.9.13 and newer behave. bug #424701 (diff) | |
| download | gentoo-2-6edb7d93d41069097517ad408767d62e41e50099.tar.gz gentoo-2-6edb7d93d41069097517ad408767d62e41e50099.tar.bz2 gentoo-2-6edb7d93d41069097517ad408767d62e41e50099.zip | |
Fix issues reported in bug #424503.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/free42/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/free42/free42-1.4.74.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app-emulation/free42/ChangeLog b/app-emulation/free42/ChangeLog index 7e7f7e9666a6..f6327141073a 100644 --- a/app-emulation/free42/ChangeLog +++ b/app-emulation/free42/ChangeLog @@ -1,6 +1,10 @@ # 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.2 2012/07/03 04:55:32 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.3 2012/07/04 17:37:31 nimiux Exp $ + + 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. + Add -O1 and --as-needed linker flags. Use emake in src_compile. 03 Jul 2012; Jeff Horelick <jdhore@gentoo.org> free42-1.4.74.ebuild: marked x86 per bug 424503 diff --git a/app-emulation/free42/free42-1.4.74.ebuild b/app-emulation/free42/free42-1.4.74.ebuild index 780d4d28c0aa..dee5e8bff73d 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.2 2012/07/03 04:55:32 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.74.ebuild,v 1.3 2012/07/04 17:37:31 nimiux Exp $ EAPI=4 @@ -18,7 +18,7 @@ IUSE="" DEPEND="dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf - x11-libs/gtk+ + x11-libs/gtk+:2 x11-libs/pango" RDEPEND="${DEPEND}" @@ -26,11 +26,14 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${PN} src_prepare() { - sed -i -e 's/hash-style=both/hash-style=gnu/' "${S}/gtk/Makefile" || die + 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/' \ + "${S}/gtk/Makefile" || die } src_compile() { - make CXX="$(tc-getCXX)" -C "${S}/gtk" || die + emake -j1 CXX="$(tc-getCXX)" -C "${S}/gtk" } src_install() { |