Fix building with -Wl,--as-needed wrt #329901 by Nao Nakashima.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 49 insertions, 10 deletions

diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index b5a2ff52537b..dc44f8eed4ab 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fotoxx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.3 2010/07/20 03:57:01 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.4 2010/07/26 14:01:33 ssuominen Exp $
+
+  26 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> fotoxx-10.7.ebuild,
+  files/fotoxx-makefile.patch:
+  Fix building with -Wl,--as-needed wrt #329901 by Nao Nakashima.
 
   20 Jul 2010; Andrey Grozin <grozin@gentoo.org> fotoxx-10.7.ebuild,
   files/fotoxx-makefile.patch:
diff --git a/media-gfx/fotoxx/files/fotoxx-makefile.patch b/media-gfx/fotoxx/files/fotoxx-makefile.patch
index 2b7985802a0e..ba3124cc8be0 100644
--- a/media-gfx/fotoxx/files/fotoxx-makefile.patch
+++ b/media-gfx/fotoxx/files/fotoxx-makefile.patch
@@ -1,10 +1,43 @@
-diff -U2 -r fotoxx-10.7.orig//Makefile fotoxx-10.7//Makefile
---- fotoxx-10.7.orig//Makefile	2010-07-07 23:31:04.000000000 +0700
-+++ fotoxx-10.7//Makefile	2010-07-16 19:06:59.000000000 +0700
-@@ -17,5 +17,5 @@
+http://bugs.gentoo.org/329901 and misc fixes
+
+--- Makefile
++++ Makefile
+@@ -5,30 +5,30 @@
+ SOURCE = $(PROGRAM)-$(VERSION).cc
+ 
+ # defaults for parameters that may be pre-defined
+-CXXFLAGS ?= -O3 -g -Wall 
+-LDFLAGS ?= -O3 -g -Wall -rdynamic
++CXXFLAGS += -Wall 
++LDFLAGS += -rdynamic
+ PREFIX ?= /usr/local
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
++CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
++LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+ 
+ BINDIR = $(PREFIX)/bin
+ DATADIR = $(PREFIX)/share/$(PROGRAM)
  ICONDIR = $(DATADIR)/icons
  DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop
 -DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
 +DOCDIR = $(PREFIX)/share/doc/$(PF)
  MANDIR = $(PREFIX)/share/man/man1
  
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+ 	@ ./dependencies.sh
+-	$(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
++	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
+ 
+ $(PROGRAM).o: $(SOURCE)
+-	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
++	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE)		\
+ 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+ 
+ zfuncs.o: zfuncs.cc
+-	$(CXX) $(CFLAGS) zfuncs.cc	\
++	$(CXX) $(CXXFLAGS) zfuncs.cc	\
+ 	  -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
+ 
+ install: $(PROGRAM)
diff --git a/media-gfx/fotoxx/fotoxx-10.7.ebuild b/media-gfx/fotoxx/fotoxx-10.7.ebuild
index c85eedbb44d7..2f7cc12096b4 100644
--- a/media-gfx/fotoxx/fotoxx-10.7.ebuild
+++ b/media-gfx/fotoxx/fotoxx-10.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.7.ebuild,v 1.2 2010/07/20 03:57:01 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.7.ebuild,v 1.3 2010/07/26 14:01:33 ssuominen Exp $
 EAPI=3
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Program for improving image files made with a digital camera."
 HOMEPAGE="http://kornelix.squarespace.com/fotoxx"
@@ -25,7 +25,8 @@ src_prepare() {
 }
 
 src_compile() {
-	emake PREFIX=/usr || die "emake failed"
+	tc-export CXX
+	emake PREFIX=/usr || die
 }
 
 src_install() {
@@ -36,6 +37,7 @@ src_install() {
 	bzip2 -9 userguide-changes
 	popd > /dev/null
 
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png "Application;Graphics;2DGraphics;"
+	emake DESTDIR="${D}" PREFIX=/usr install || die
+	make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \
+		"Application;Graphics;2DGraphics"
 }