Respecting CC variable, closes bug #243928

Package-Manager: portage-2.1.6.13/cvs/Linux i686

6 files changed, 122 insertions, 25 deletions

diff --git a/dev-libs/libtommath/ChangeLog b/dev-libs/libtommath/ChangeLog
index 0efa05cf7e57..85ec81df283e 100644
--- a/dev-libs/libtommath/ChangeLog
+++ b/dev-libs/libtommath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libtommath
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/ChangeLog,v 1.28 2009/07/24 16:41:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/ChangeLog,v 1.29 2009/07/28 21:53:31 vostorga Exp $
+
+  28 Jul 2009; Víctor Ostorga <vostorga@gentoo.org>
+  libtommath-0.36-r1.ebuild, +files/libtommath-0.36-CC.patch,
+  libtommath-0.41.ebuild, +files/libtommath-0.41-CC.patch:
+  Respecting CC variable, closes bug #243928
 
   24 Jul 2009; Joseph Jezak <josejx@gentoo.org> libtommath-0.36-r1.ebuild:
   Marked ppc64 stable.
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index d480f50886d7..316b84a0c709 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libtommath-0.36-CC.patch 2092 RMD160 069f257b8a4f69e9803dbe418cbc3c3d69c93a6f SHA1 e0246753a70cede88e887092f2ad80743daac70b SHA256 8e1379b42651c338f60b2785a91226285a91b39eed53075aaef1e54b86e51af9
 AUX libtommath-0.36-LDFLAGS.patch 1017 RMD160 fd42d3f614fcbf13dd72084a95a275c719b524b5 SHA1 060ececae235aeac62af2988fadc6b122a61c9df SHA256 d995282988eadb5a5bad6306025269ca1003523cff5e887a993e915a611c8dd7
 AUX libtommath-0.36-shared-lib.patch 948 RMD160 0dd3cd1bb4508623c24e4f57106d05975d81904f SHA1 6a65b2c21db1bfdfe342d78cff4204da495c6b06 SHA256 c09eae16b6094ba85e78413abc72b57437c51abfd9caff9aa87558223a385b23
+AUX libtommath-0.41-CC.patch 1853 RMD160 6d7447753799caa37a585b1fcc4b0adfbc32cdb0 SHA1 3d6b68fbecb5716f00ee7d92ed334970cf114f01 SHA256 d24c16c2949d3a0d44537362f4c512c5046af0531eb45e66d69e92c3e3530540
 AUX libtommath-0.41-LDFLAGS.patch 1238 RMD160 a2d084bd5fc0ad19bb0508e0b5702f029d0d8834 SHA1 62218b2de135c5670dae14d959cfa9194ee18083 SHA256 0aa280b6f8daf7d4a6f8851afe7945cb59c8ea4ef991c39331450c7d395b35eb
 DIST ltm-0.36.tar.bz2 1924150 RMD160 f9fc66d076913b7e6b0226470b5cff3caa704c2d SHA1 f62419350a13d3f771dd2912b688b37dc912666a SHA256 16243c61694a52553a2d65c097456e024d8dcd9e3571c8f712ca163eaa769c6b
 DIST ltm-0.41.tar.bz2 1972854 RMD160 de6de0aedba8eb37687b4f583263713f1882fec8 SHA1 a6db2221c64a1951c5c78d573dbf427f989fd346 SHA256 8e397fc42a12f520ea50c29e477a8768a6f974af2470636f6f807141c13a240c
-EBUILD libtommath-0.36-r1.ebuild 939 RMD160 78d81ef0160b7671427a6edede517afefea44ff9 SHA1 100e63a4798b80eee74402c1d641282d3f25eb4d SHA256 93120019fd483d1e2ba77a78477e5fd646bcbd2a85ec6e4c0b6b7fb5fa075db8
-EBUILD libtommath-0.41.ebuild 897 RMD160 5114c5715c7d1308127e4b42ccfcc0725eb03c7f SHA1 8dde80028ceba84761dc6fa353f1237b91c779cd SHA256 823cde9d5da3ff1f06291d3ec9e11063c8c0d151cc485bb343183e7875233c28
-MISC ChangeLog 3712 RMD160 c13b172ff04e782d9eb7eddcb3adbc9cf5bcc99e SHA1 e2e2f9cd2860f2e1430f7a94e1750a25ebabb4c9 SHA256 3dd41d4856b259c6049b2afa9be8f6cc9e54977baec2d964bb4ad4cd6440d4bc
+EBUILD libtommath-0.36-r1.ebuild 1003 RMD160 101c6f67b51f01f79cd2772887e71e899f3b7252 SHA1 2ac14415382cbd4f33fbf3f4114bd11016f849a0 SHA256 17eff264e2506b572ab262e09821757cabde6340c2be234f093f49e0328e8733
+EBUILD libtommath-0.41.ebuild 949 RMD160 6d15ca3a7a852c115150d81664a0ac2e58f06edc SHA1 c6dfa2f150ed221695d4c1dae2c0ab94859e1a75 SHA256 aaade666e60ba2e26a88e969a2f16e192ed913e2dff96908f28bcfdc82d488e9
+MISC ChangeLog 3934 RMD160 ea0409281f28a2e7cc33d1ed5e22f2cc3e27f85a SHA1 d319c38c9318da6fea6f18c888e8b1b9a132b112 SHA256 a68aaa394460e019fde59c225bed02d7ef55ef78d539a600699548041383d0ce
 MISC metadata.xml 2830 RMD160 1e104847dd2267a6f85eb8e1e7e3c9b75cbc45c8 SHA1 c2e1e9ad626d9f6c6cf4a2bdc7bb812066627c79 SHA256 1fdea6550a9bed99c76c1043e161d8d90712951347b3d8dd246cea0654f0ae0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpp5DYACgkQcsIHjyDViGRquwCfSPyRBUl3PMNtEtOWKR3fCwy3
-bzMAoOhw1vtU1CK0wS6UrP47wWVEsaR6
-=wa8M
------END PGP SIGNATURE-----
diff --git a/dev-libs/libtommath/files/libtommath-0.36-CC.patch b/dev-libs/libtommath/files/libtommath-0.36-CC.patch
new file mode 100644
index 000000000000..7632e42f4d81
--- /dev/null
+++ b/dev-libs/libtommath/files/libtommath-0.36-CC.patch
@@ -0,0 +1,50 @@
+diff -NrU5 libtommath-0.36.original/makefile.shared libtommath-0.36/makefile.shared
+--- libtommath-0.36.original/makefile.shared	2009-07-28 21:10:57.000000000 -0600
++++ libtommath-0.36/makefile.shared	2009-07-28 21:20:30.000000000 -0600
+@@ -1,11 +1,11 @@
+ #Makefile for GCC
+ #
+ #Tom St Denis
+ VERSION=0:36
+ 
+-CC = libtool --mode=compile gcc
++LTCOMPILE = libtool --mode=compile $(CC)
+ 
+ CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
+ 
+ ifndef IGNORE_SPEED
+ 
+@@ -78,24 +78,27 @@
+ bn_mp_init_multi.o bn_mp_clear_multi.o bn_mp_exteuclid.o bn_mp_toradix_n.o \
+ bn_mp_prime_random_ex.o bn_mp_get_int.o bn_mp_sqrt.o bn_mp_is_square.o bn_mp_init_set.o \
+ bn_mp_init_set_int.o bn_mp_invmod_slow.o bn_mp_prime_rabin_miller_trials.o \
+ bn_mp_to_signed_bin_n.o bn_mp_to_unsigned_bin_n.o
+ 
++.c.o:
++	$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++
+ $(LIBNAME):  $(OBJECTS)
+-	libtool --mode=link --tag=CC gcc $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+-	libtool --mode=link --tag=CC gcc *.o -o $(LIBNAME_S)
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
++	libtool --mode=link --tag=CC $(CC) *.o -o $(LIBNAME_S)
+ 
+ install: $(LIBNAME) $(HEADERS)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+ 	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
+ 	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
+ 
+ test: $(LIBNAME) demo/demo.o
+-	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
+-	libtool --mode=link gcc $(LDFLAGS) -o test demo/demo.o $(LIBNAME)
++	$(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
++	libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME)
+ 	
+ mtest: test	
+-	cd mtest ; gcc $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
++	cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
+         
+ timing: $(LIBNAME)
+-	libtool --mode=link gcc $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o ltmtest
++	libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME) -o ltmtest
diff --git a/dev-libs/libtommath/files/libtommath-0.41-CC.patch b/dev-libs/libtommath/files/libtommath-0.41-CC.patch
new file mode 100644
index 000000000000..5eef4ee12962
--- /dev/null
+++ b/dev-libs/libtommath/files/libtommath-0.41-CC.patch
@@ -0,0 +1,48 @@
+diff -NrU5 libtommath-0.41.original/makefile.shared libtommath-0.41/makefile.shared
+--- libtommath-0.41.original/makefile.shared	2009-07-28 21:59:47.000000000 -0600
++++ libtommath-0.41/makefile.shared	2009-07-28 22:01:32.000000000 -0600
+@@ -1,11 +1,11 @@
+ #Makefile for GCC
+ #
+ #Tom St Denis
+ VERSION=0:41
+ 
+-CC = libtool --mode=compile --tag=CC gcc
++LTCOMPILE = libtool --mode=compile --tag=CC $(CC)
+ 
+ CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
+ 
+ ifndef IGNORE_SPEED
+ 
+@@ -80,23 +80,26 @@
+ bn_mp_init_set_int.o bn_mp_invmod_slow.o bn_mp_prime_rabin_miller_trials.o \
+ bn_mp_to_signed_bin_n.o bn_mp_to_unsigned_bin_n.o
+ 
+ objs: $(OBJECTS)
+ 
++.c.o:
++	$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++
+ $(LIBNAME):  $(OBJECTS)
+-	libtool --mode=link --tag=CC gcc $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+ 
+ install: $(LIBNAME)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
+ 	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+ 	install -m 644 -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
+ 
+ test: $(LIBNAME) demo/demo.o
+-	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
+-	libtool --mode=link gcc $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
++	$(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
++	libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
+ 	
+ mtest: test	
+-	cd mtest ; gcc $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
++	cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
+         
+ timing: $(LIBNAME)
+-	libtool --mode=link gcc $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
++	libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
diff --git a/dev-libs/libtommath/libtommath-0.36-r1.ebuild b/dev-libs/libtommath/libtommath-0.36-r1.ebuild
index ee8bcc911c03..c8a698672b10 100644
--- a/dev-libs/libtommath/libtommath-0.36-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.36-r1.ebuild,v 1.12 2009/07/24 16:41:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.36-r1.ebuild,v 1.13 2009/07/28 21:53:31 vostorga Exp $
 
 inherit eutils multilib
 
@@ -19,18 +19,19 @@ RDEPEND=""
 RESTRICT="test"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-shared-lib.patch
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+		unpack ${A}
+		cd "${S}"
+		epatch "${FILESDIR}"/${P}-shared-lib.patch
+		epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+		epatch "${FILESDIR}"/${P}-CC.patch
 }
 
 src_compile() {
-	emake -f makefile.shared IGNORE_SPEED=1 || die
+		emake CC="$(tc-getCC)" -f makefile.shared IGNORE_SPEED=1 || die
 }
 
 src_install() {
-	make -f makefile.shared install DESTDIR="${D}" LIBPATH="/usr/$(get_libdir)" || die
-	dodoc changes.txt *.pdf
-	docinto demo ; dodoc demo/*
+		make -f makefile.shared install DESTDIR="${D}" LIBPATH="/usr/$(get_libdir)" || die
+		dodoc changes.txt *.pdf
+		docinto demo ; dodoc demo/*
 }
diff --git a/dev-libs/libtommath/libtommath-0.41.ebuild b/dev-libs/libtommath/libtommath-0.41.ebuild
index 1e7fbcd5b221..e397c7d29e37 100644
--- a/dev-libs/libtommath/libtommath-0.41.ebuild
+++ b/dev-libs/libtommath/libtommath-0.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.41.ebuild,v 1.2 2009/03/30 16:28:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.41.ebuild,v 1.3 2009/07/28 21:53:31 vostorga Exp $
 
 inherit eutils multilib
 
@@ -20,10 +20,11 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+	epatch "${FILESDIR}"/${P}-CC.patch
 }
 
 src_compile() {
-	emake -f makefile.shared IGNORE_SPEED=1 || die "emake failed"
+	emake CC=$(tc-getCC) -f makefile.shared IGNORE_SPEED=1 || die "emake failed"
 }
 
 src_install() {