app-misc/golly: Respect CXX, link as-needed conform, don't use LDFLAGS for libs

svn path=/sunrise/; revision=10807

4 files changed, 45 insertions, 7 deletions

diff --git a/app-misc/golly/ChangeLog b/app-misc/golly/ChangeLog
index 12318e414..99b631470 100644
--- a/app-misc/golly/ChangeLog
+++ b/app-misc/golly/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jun 2010; Justin Lecher <jlec@gentoo.org> golly-2.1.ebuild,
+  +files/golly-2.1-as-needed.patch:
+  Respect CXX, link as-needed conform, don't use LDFLAGS for libs
+
   21 Jun 2010; Maks Verver (Soultaker) <maksverver@geocities.com>
   +golly-2.1.ebuild, +files/golly-2.1-perl-ldopts.patch,
   +files/golly-2.1-python-amd64.patch,
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index fe1e2f96f..caca67b84 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,7 +1,8 @@
+AUX golly-2.1-as-needed.patch 1248 RMD160 fe39cfb39af27e6a475cfed4afcbfafa0768c66c SHA1 1fc5426096943454e26547aedf1f80d1a39e7b49 SHA256 a5f782518b90fba1c74e7ed3e085c6c4ba65fdd4de729663f51cb96696c8b17f
 AUX golly-2.1-perl-ldopts.patch 601 RMD160 c3120483bbccd864d89a52b5fec0c61dcc0c0fec SHA1 c48ca9e4d8882612f637a44877a0b2eb85c68679 SHA256 f98245df74f571913dc1a6a1d0ef5569e6f0dd2ae1619f8bee69cf521aea9ccd
 AUX golly-2.1-python-amd64.patch 1169 RMD160 974e2e6c016f1aad3f5148825dc9170c294c5e2c SHA1 b9449caa47c3c5b78c88107b50d91078280d0065 SHA256 26d607f961f14f9759f2669ff57e65774baee7e171358aadb322fa7f06d6ff68
 AUX golly-separate-data-directory.patch 2375 RMD160 02283791a7ff63e6b29e284bfc16a739bb71975b SHA1 3fb21d16e5c38aea5ba6e1ef59e140b371e834d6 SHA256 6bb1f21d516a9b9bc48808708b29215f12582236aec729214bcecb02d78b6f79
 DIST golly-2.1-src.tar.gz 2394506 RMD160 d7ea0adf6525a8f4a9beecc0a060cfdc791b1c28 SHA1 553bcc6b1ece0dfbc5728713cb7e5c736b15516c SHA256 bfe561fd2f7f20fedfb76abc77c6c8cc5a8cb0586a37a6f7bb5df37b16f83a55
-EBUILD golly-2.1.ebuild 1578 RMD160 ce3e89fd3a40a309daa2e7de5838d47da19eca25 SHA1 e5f6789af15f7a005f254914fe13e1e3bee41ecb SHA256 e217799306eae823164d662b0bd8daf0e7a1ebeb887a0b2c34923f9ebe0f5917
-MISC ChangeLog 367 RMD160 e78cd422a5565fc95fe58e482628bbeebaad3aff SHA1 439cb0dedcd4ac73903c02e2a3fbb08fc6441a3b SHA256 5ce5812357117b94b1badfd0ca2d54bc86caa48be03cf73a49045b5073892dce
+EBUILD golly-2.1.ebuild 1647 RMD160 c45bd924f6ed9cff7f0bdbee3178516bb22491e4 SHA1 7c9d9bc2f1a7de896e639bdb03de2c14a6a55194 SHA256 58fe840a9513c0a3f5ebb93d5f8aa578daeb7879de72f9050a0b02cbcccb37fe
+MISC ChangeLog 535 RMD160 fe0987df89f0bf8bd6834a9ea08b7c7c8a4e5572 SHA1 9642eb7270edb8e9f05bbe4920d8a6dd674ec868 SHA256 1d268999f78416a9839e32d41cebd06c84c9b7a96854b5cfc9f603130b5096ec
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/app-misc/golly/files/golly-2.1-as-needed.patch b/app-misc/golly/files/golly-2.1-as-needed.patch
new file mode 100644
index 000000000..f65df4a59
--- /dev/null
+++ b/app-misc/golly/files/golly-2.1-as-needed.patch
@@ -0,0 +1,30 @@
+diff --git a/makefile-gtk b/makefile-gtk
+index 56b31d0..a09aad4 100644
+--- a/makefile-gtk
++++ b/makefile-gtk
+@@ -21,7 +21,7 @@ BINFILES = golly bgolly RuleTableToTree
+ CXXC = g++
+ CXXFLAGS = `wx-config --cxxflags` -O5 -DZLIB -DVERSION=$(VERSION) \
+    -Wall -Wno-non-virtual-dtor -fno-strict-aliasing
+-LDFLAGS = `wx-config --libs` -lz
++LIBS = `wx-config --libs` -lz
+ 
+ # for Perl script support
+ PERL_INCLUDE = `perl -MExtUtils::Embed -e ccopts`
+@@ -72,13 +72,13 @@ clean:
+ 	rm -f golly bgolly RuleTableToTree
+ 
+ golly: $(BASEOBJ) $(WXOBJ)
+-	$(CXXC) $(CXXFLAGS) -o golly $(BASEOBJ) $(WXOBJ) $(LDFLAGS) $(PYTHON_LINK) $(PERL_LINK)
++	$(CXXC) $(CXXFLAGS) $(LDFLAGS) -o golly $(BASEOBJ) $(WXOBJ) $(LIBS) $(PYTHON_LINK) $(PERL_LINK)
+ 
+ bgolly: $(BASEOBJ) $(OBJDIR)/bgolly.o
+-	$(CXXC) $(CXXFLAGS) -o bgolly $(BASEOBJ) $(OBJDIR)/bgolly.o $(LDFLAGS)
++	$(CXXC) $(CXXFLAGS) $(LDFLAGS) -o bgolly $(BASEOBJ) $(OBJDIR)/bgolly.o $(LIBS)
+ 
+ RuleTableToTree: $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o
+-	$(CXXC) $(CXXFLAGS) -o RuleTableToTree $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o $(LDFLAGS)
++	$(CXXC) $(CXXFLAGS) $(LDFLAGS) -o RuleTableToTree $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o $(LIBS)
+ 
+ $(OBJDIR)/bgolly.o: bgolly.cpp
+ 	$(CXXC) $(CXXFLAGS) -c -o $@ bgolly.cpp
diff --git a/app-misc/golly/golly-2.1.ebuild b/app-misc/golly/golly-2.1.ebuild
index e952bb3c0..58a512952 100644
--- a/app-misc/golly/golly-2.1.ebuild
+++ b/app-misc/golly/golly-2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=2
 PYTHON_DEPEND=2
 WX_GTK_VER=2.8
 
-inherit eutils python wxwidgets
+inherit eutils python wxwidgets toolchain-funcs
 
 MY_P=${P}-src
 DESCRIPTION="A simulator for Conway's Game of Life and other cellular automata"
@@ -38,6 +38,9 @@ src_prepare() {
 	# Fix installing data files into a different directory than binaries:
 	epatch "${FILESDIR}"/${PN}-separate-data-directory.patch
 
+	# We need this for correct linking
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
 	# Get rid of .DS_Store and other stuff that should not be installed:
 	find . -name '.*' -delete || die
 	find Scripts/Python -name '*.pyc' -delete || die
@@ -46,16 +49,16 @@ src_prepare() {
 	sed -i -e "s|libpython2.5.so|$(python_get_library)|" wxprefs.cpp || die
 
 	# Insert user-specified compiler flags into Makefile:
-	sed -i -e "/^CXXFLAGS = /s/-O5/${CXXFLAGS}/" \
-		-e "s/^LDFLAGS = /&${LDFLAGS} /" makefile-gtk || die
+	sed -i -e "/^CXXFLAGS = /s/-O5/${CXXFLAGS}/" makefile-gtk || die
 }
 
 src_compile() {
-	emake -f makefile-gtk || die
+	emake \
+		CXXC="$(tc-getCXX)" \
+		-f makefile-gtk || die
 }
 
 src_install() {
-	insinto /usr/bin
 	dobin golly bgolly RuleTableToTree || die
 
 	insinto /usr/share/${PN}