Fix cc and cxx calls, bug #194240, thanks to Chris Slycord <cslycord at gmail dot com> for the fix

Package-Manager: portage-2.1.3.9

3 files changed, 25 insertions, 17 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 46e2ca8e86eb..53e93f540f6c 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.99 2007/10/13 16:04:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.100 2007/10/16 17:28:15 armin76 Exp $
+
+  16 Oct 2007; Raúl Porcel <armin76@gentoo.org> enigmail-0.95.3.ebuild:
+  Fix cc and cxx calls, bug #194240, thanks to Chris Slycord <cslycord at
+  gmail dot com> for the fix
 
   13 Oct 2007; Markus Rothe <corsair@gentoo.org> enigmail-0.95.3.ebuild:
   Stable on ppc64; bug #193542
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 87f400dfce8c..30f025837ae6 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -102,14 +102,14 @@ EBUILD enigmail-0.95.2-r1.ebuild 5936 RMD160 20a0148ba4fc83fabda3fa2f75094be6b1c
 MD5 6565cf524307f476b05117683476a70d enigmail-0.95.2-r1.ebuild 5936
 RMD160 20a0148ba4fc83fabda3fa2f75094be6b1c615f3 enigmail-0.95.2-r1.ebuild 5936
 SHA256 fc95290f224d56c151b32d065473724da4162b3632a80d2fb2797136e998d87a enigmail-0.95.2-r1.ebuild 5936
-EBUILD enigmail-0.95.3.ebuild 5934 RMD160 1542b1f6f9fbf20bdc931af7555e3525d586ebf5 SHA1 0e806e051620487bae8394796266ee60e998cd84 SHA256 da2c9d262c5c3940f56982a8273d6210916d26bda2ecf7f064e05a676ec9122e
-MD5 4247b2b423d600822f150a55b01993b3 enigmail-0.95.3.ebuild 5934
-RMD160 1542b1f6f9fbf20bdc931af7555e3525d586ebf5 enigmail-0.95.3.ebuild 5934
-SHA256 da2c9d262c5c3940f56982a8273d6210916d26bda2ecf7f064e05a676ec9122e enigmail-0.95.3.ebuild 5934
-MISC ChangeLog 14032 RMD160 da5b855f2541555506a7112151b25e2d76e6d4ad SHA1 ec863ba5a5264f438067e01287c0b02601558e3f SHA256 b509c616f936e28fee3386e75caccc8580a205d442935180f09406106e1dba64
-MD5 59e368cf23eb0868f67c23bd6245fd65 ChangeLog 14032
-RMD160 da5b855f2541555506a7112151b25e2d76e6d4ad ChangeLog 14032
-SHA256 b509c616f936e28fee3386e75caccc8580a205d442935180f09406106e1dba64 ChangeLog 14032
+EBUILD enigmail-0.95.3.ebuild 6184 RMD160 0eaaa318079e81403a309ee712fc8f8de424a640 SHA1 f51e2c4e8e94f61e118a007481f15a3c3834a7ae SHA256 6d01f3bd452923cb9caba5f789cf9ada3ef5b4214c68da58178b01f18187f754
+MD5 ff2b4823503e9dbe6f7f4c28374a3e70 enigmail-0.95.3.ebuild 6184
+RMD160 0eaaa318079e81403a309ee712fc8f8de424a640 enigmail-0.95.3.ebuild 6184
+SHA256 6d01f3bd452923cb9caba5f789cf9ada3ef5b4214c68da58178b01f18187f754 enigmail-0.95.3.ebuild 6184
+MISC ChangeLog 14210 RMD160 0ccef1c171e3d913698cc2bce443ac5ef2259d58 SHA1 c7d7ff33d9b18b48ff1995c144ec6a02149927cb SHA256 c4bf8ea1d722b7324832252e9ef8b75feab7750552bdfaf6dc2224cc67f2a0d7
+MD5 00e4b1bad2208949cdde4dd450991dcd ChangeLog 14210
+RMD160 0ccef1c171e3d913698cc2bce443ac5ef2259d58 ChangeLog 14210
+SHA256 c4bf8ea1d722b7324832252e9ef8b75feab7750552bdfaf6dc2224cc67f2a0d7 ChangeLog 14210
 MISC metadata.xml 238 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 SHA1 fb7dacf03f1ce8294d6d2f07d4c2d7ff69ee7525 SHA256 ef51e99b6b1ccee48a71906e90a4111f58793292fe1248934a811fcb02506036
 MD5 22a1feabf45dadbfa2268b7fff3ce66e metadata.xml 238
 RMD160 20be188d400f8ae54fb1eae8bfb243c43eed2395 metadata.xml 238
diff --git a/x11-plugins/enigmail/enigmail-0.95.3.ebuild b/x11-plugins/enigmail/enigmail-0.95.3.ebuild
index 24d0068c6467..f567577c34e2 100644
--- a/x11-plugins/enigmail/enigmail-0.95.3.ebuild
+++ b/x11-plugins/enigmail/enigmail-0.95.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.3.ebuild,v 1.5 2007/10/13 16:04:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-0.95.3.ebuild,v 1.6 2007/10/16 17:28:15 armin76 Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 WANT_AUTOCONF=2.1
@@ -153,20 +153,24 @@ src_compile() {
 	# requirements while compiling
 	edit_makefiles
 
+	# Doesn't like to build with CHOST-specific commands.
+	MY_CC=$(tc-getCC)
+	MY_CXX=$(tc-getCXX)
+
 	# Only build the parts necessary to support building enigmail
-	emake -j1 export || die "make export failed"
-	emake -C modules/libreg || die "make modules/libreg failed"
-	emake -C xpcom/string || die "make xpcom/string failed"
-	emake -C xpcom || die "make xpcom failed"
-	emake -C xpcom/obsolete || die "make xpcom/obsolete failed"
+	emake CC=$MY_CC CXX=$MY_CXX -j1 export || die "make export failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C modules/libreg || die "make modules/libreg failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C xpcom/string || die "make xpcom/string failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C xpcom || die "make xpcom failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C xpcom/obsolete || die "make xpcom/obsolete failed"
 
 	# Build the enigmail plugin
 	einfo "Building Enigmail plugin..."
-	emake -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
+	emake CC=$MY_CC CXX=$MY_CXX -C ${S}/mailnews/extensions/enigmail || die "make enigmail failed"
 
 	# Package the enigmail plugin; this may be the easiest way to collect the
 	# necessary files
-	emake -j1 -C ${S}/mailnews/extensions/enigmail xpi || die "make xpi failed"
+	emake CC=$MY_CC CXX=$MY_CXX -j1 -C ${S}/mailnews/extensions/enigmail xpi || die "make xpi failed"
 }
 
 src_install() {