Respect CFLAGS, LDFLAGS (#332599)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 105 insertions, 9 deletions

diff --git a/dev-lang/tcc/ChangeLog b/dev-lang/tcc/ChangeLog
index 933a1a59da25..b73d66f7fa44 100644
--- a/dev-lang/tcc/ChangeLog
+++ b/dev-lang/tcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tcc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.30 2010/07/08 16:29:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/ChangeLog,v 1.31 2010/08/16 20:05:34 truedfx Exp $
+
+  16 Aug 2010; Harald van Dijk <truedfx@gentoo.org> tcc-0.9.25.ebuild,
+  +files/tcc-0.9.25-flags.patch:
+  Respect CFLAGS, LDFLAGS (#332599)
 
   08 Jul 2010; Markos Chandras <hwoarang@gentoo.org> tcc-0.9.25.ebuild:
   Make it respect CC variable wrt bug #243892
diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
index e1c36d4527bb..2bac6dbb0299 100644
--- a/dev-lang/tcc/Manifest
+++ b/dev-lang/tcc/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tcc-0.9.23-anonunion.patch 1971 RMD160 5268cbdbbbb302b8a4a58fba0644f336a90102e7 SHA1 a0d8392187d1965d701feb4892d57141633147c4 SHA256 32ecc52923bb10a6ff43e507e097d41c7da8717a6b2e749bccd4f0310704e9a5
 AUX tcc-0.9.23-asneeded.patch 1711 RMD160 6e0cf4ffe8a7c14d6090b8aa8c9fdfce19f23919 SHA1 a043fa74a37f32b2e2f039c0c440af19ce7f10b0 SHA256 14d3029d2cb7a27c3dfbdc98562aa309d5a3002218ba115584c605ea4cd8e839
 AUX tcc-0.9.23-nxbit.patch 2160 RMD160 f3b2632ceb45220b24654a30f3f60df27c2bee1f SHA1 391599f7d8229cbc7dddf09f4537ab14c301637a SHA256 1296c9023fb2787e0c8530b27ff565175725b406d5ec54b1898a9b5550bb848d
+AUX tcc-0.9.25-flags.patch 2768 RMD160 872da6121befab31a6c19182e6e5a3d5ea645dad SHA1 3ad03a96477cc9e28fe49a2021bee2684589248f SHA256 91011cc843a7563bc91ca71e9bcc8dcd95102d370b276b266f12a64ddd705070
 DIST tcc-0.9.23.tar.gz 423807 RMD160 c7b1cffa8b0b3e8dd828ffd249249f21efe1ee55 SHA1 4e7d1d00043b365da45ead8d66a9831567bcdeeb SHA256 074632c574116004c63b32798048c73c184d123d8cf96cce849765296b255991
 DIST tcc-0.9.24.tar.bz2 364601 RMD160 408f7cfdfcc6d57d030f37734fc34c2418bdf7bb SHA1 d10b1f976fd3acd45de242f3ec3da52dde47ad24 SHA256 27aed4071ab6ec5a7b5425d0346a214747ab6375353ca3ee8514f87984f94e79
 DIST tcc-0.9.25.tar.bz2 382914 RMD160 2c9ff86d8cd82845ff95921bf6d933e536306baa SHA1 9116e5fc94bb65d827b42888ad0042df6c7ca562 SHA256 1bed6cb0fb2ef4100df1b94435d22863679e84cf419ec48ef96d9c0e9063de35
 EBUILD tcc-0.9.23-r1.ebuild 1541 RMD160 1a99541570372283280ce32d9bccab5fb5b48ab4 SHA1 117193bd138892fcb40aa4ccf0cf9ef0f49e6db8 SHA256 32cdd2dde46e229571e4e9dee874118371a4b630388914f8ba9f867776763611
 EBUILD tcc-0.9.24.ebuild 1567 RMD160 e821cc62c73dfb0ed1487d3ff38020f9491965d4 SHA1 e9ec023596faf152e0521cdeca9a763677fc739b SHA256 990874e27f30952a339ae0d33051204f0e602cfe7711c53aa99b45196af86cf2
-EBUILD tcc-0.9.25.ebuild 1576 RMD160 d107604c6522bbd5a892c471078bd63f474d9bf0 SHA1 ab855847620e02188371e5735d379e6e1f6fb87e SHA256 ce56a03aa9706438d40f73e656101c6e5efafdd4c38c342dedd16dde07263b06
-MISC ChangeLog 4947 RMD160 01463749e987aadbf17a8e5bdef59a43ce78b879 SHA1 50a40d327d8a53087a462bea278118c23ea9ef71 SHA256 301faaad45635a22d63260a7229aafdd93e1cb0128099195b77154f08e0f5303
+EBUILD tcc-0.9.25.ebuild 1473 RMD160 25f30777c5f4b5794f86bbadd784bc2fac91f47b SHA1 98c94c5cd80d56ec55cec56e46dcc66c38212caa SHA256 6885eaea0056448a90479bc7b5a5f208eff645ff204a67d37cadc369d0c3bd74
+MISC ChangeLog 5087 RMD160 df553f565a9a09970454e2c97d96f8c7a9ad911d SHA1 a4f0846a3ab8eabcd19a6bd2a3f2099e67236229 SHA256 af74cbb0b7307686e8e1f5252c9c7ae9a41670ae8bbaabf9e57e2ab9d77786d0
 MISC metadata.xml 162 RMD160 359e0d4ecc394cc3fb84227087c1a518d9e6c347 SHA1 d4c1c09bc042bd11d40dc634bf52edb93e4cf6f0 SHA256 444ece0c3cb4908c78c6588147078383d3636d1b3da9a20111ec03c5640eefdb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxpmrcACgkQwnQyISwouHzT5ACeOTrDmf1knTV8EokCJodFgVK8
+HFcAoIA888mWCRV/3P/cvgooFdh6VKh+
+=3hWt
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tcc/files/tcc-0.9.25-flags.patch b/dev-lang/tcc/files/tcc-0.9.25-flags.patch
new file mode 100644
index 000000000000..42ac9f3bfbfa
--- /dev/null
+++ b/dev-lang/tcc/files/tcc-0.9.25-flags.patch
@@ -0,0 +1,83 @@
+diff --git a/Makefile b/Makefile
+index 1a2b5f7..30526b2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -115,32 +115,32 @@ all: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc-doc.html tcc.1 libtcc_test$(EX
+ 
+ # Host Tiny C Compiler
+ tcc$(EXESUF): $(NATIVE_FILES)
+-	$(CC) -o $@ $< $(NATIVE_TARGET) $(CFLAGS) $(LIBS)
++	$(CC) -o $@ $(NATIVE_TARGET) $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ # Cross Tiny C Compilers
+ i386-tcc$(EXESUF): $(I386_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_I386 $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_I386 $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ i386-win32-tcc$(EXESUF): $(WIN32_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_PE $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_PE $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ x86_64-tcc$(EXESUF): $(X86_64_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_X86_64 $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_X86_64 $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ c67-tcc$(EXESUF): $(C67_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_C67 $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_C67 $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ arm-tcc-fpa$(EXESUF): $(ARM_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_ARM $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_ARM $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ arm-tcc-fpa-ld$(EXESUF): $(ARM_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_ARM -DLDOUBLE_SIZE=12 $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_ARM -DLDOUBLE_SIZE=12 $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ arm-tcc-vfp$(EXESUF): $(ARM_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_VFP $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_ARM -DTCC_ARM_VFP $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ arm-tcc-vfp-eabi$(EXESUF): $(ARM_FILES)
+-	$(CC) -o $@ $< -DTCC_TARGET_ARM -DTCC_ARM_EABI $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -DTCC_TARGET_ARM -DTCC_ARM_EABI $(CFLAGS) $(LDFLAGS) $< $(LIBS)
+ 
+ # libtcc generation and test
+ libtcc.o: $(NATIVE_FILES)
+@@ -150,14 +150,14 @@ libtcc.a: libtcc.o
+ 	$(AR) rcs $@ $^
+ 
+ libtcc_test$(EXESUF): tests/libtcc_test.c libtcc.a
+-	$(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS)
++	$(CC) -o $@ -I. $(CFLAGS) $(LDFLAGS) $^ $(LIBS)
+ 
+ libtest: libtcc_test$(EXESUF) $(LIBTCC1)
+ 	./libtcc_test$(EXESUF) lib_path=.
+ 
+ # profiling version
+ tcc_p$(EXESUF): $(NATIVE_FILES)
+-	$(CC) -o $@ $< $(NATIVE_TARGET) $(CFLAGS_P) $(LIBS_P)
++	$(CC) -o $@ $(NATIVE_TARGET) $(CFLAGS_P) $(LDFLAGS) $< $(LIBS_P)
+ 
+ # windows utilities
+ tiny_impdef$(EXESUF): win32/tools/tiny_impdef.c
+@@ -180,16 +180,16 @@ LIBTCC1_OBJS+=alloca86.o alloca86-bt.o
+ endif
+ 
+ %.o: %.c
+-	$(LIBTCC1_CC) -o $@ -c $< -O2 -Wall
++	$(LIBTCC1_CC) $(CFLAGS) -c $< -o $@
+ 
+ %.o: %.S
+-	$(LIBTCC1_CC) -o $@ -c $<
++	$(LIBTCC1_CC) $(ASFLAGS) -c $< -o $@
+ 
+ libtcc1.a: $(LIBTCC1_OBJS)
+ 	$(AR) rcs $@ $^
+ 
+ bcheck.o: bcheck.c
+-	$(CC) -o $@ -c $< -O2 -Wall
++	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ # install
+ TCC_INCLUDES = stdarg.h stddef.h stdbool.h float.h varargs.h tcclib.h
diff --git a/dev-lang/tcc/tcc-0.9.25.ebuild b/dev-lang/tcc/tcc-0.9.25.ebuild
index 8c245b663a89..64abe0442ddc 100644
--- a/dev-lang/tcc/tcc-0.9.25.ebuild
+++ b/dev-lang/tcc/tcc-0.9.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.25.ebuild,v 1.2 2010/07/08 16:29:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcc/tcc-0.9.25.ebuild,v 1.3 2010/08/16 20:05:34 truedfx Exp $
 
 inherit eutils toolchain-funcs
 
@@ -24,9 +24,7 @@ RESTRICT="test"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#epatch "${FILESDIR}"/${PN}-0.9.23-anonunion.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.23-asneeded.patch
-	#epatch "${FILESDIR}"/${PN}-0.9.23-nxbit.patch
+	epatch "${FILESDIR}"/${PN}-0.9.25-flags.patch
 
 	# Don't strip
 	sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile
@@ -43,8 +41,8 @@ src_compile() {
 	local myopts
 	use x86 && myopts="--cpu=x86"
 	use amd64 && myopts="--cpu=x86-64"
-	econf ${myopts}
-	emake CC="$(tc-getCC)" || die "make failed"
+	econf ${myopts} --cc="$(tc-getCC)"
+	emake || die "make failed"
 }
 
 src_install() {