Fix gcc command used for linking libmilter.so

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

3 files changed, 15 insertions, 12 deletions

diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 5dd6bdff5c83..d766a19a703a 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -10,7 +10,7 @@ AUX sendmail-CVE-2006-1173.patch 1486 RMD160 33a6bf2dcf1bf6cd9d2702bc9705ceb80fb
 AUX sendmail-delivered_hdr.patch 341 RMD160 a190574a57c643233c0d23e8b69dbf3cd3943f41 SHA1 17d034625524438dc98a2a7a14a7bfe2fb047420 SHA256 bfe354d1047c66ea857e56cb374f583eb779c8f4ccc92ea766e916ec358cd77c
 AUX sendmail-procmail.mc 357 RMD160 e912a3d2f91fc60e0856e1a537b9a9851788172f SHA1 536e5b842ef280f2abd86ee0f8f5987a885350b7 SHA256 8da4cc39758ff1668d7bf7c3713914cb44ef8d084ab822629316ee3caae90856
 AUX sendmail.mc 299 RMD160 cb659c515cc2b5de750b645fbcfb7a8a60ad60ae SHA1 c93483684c46356cd1d09899517539c5406b5bd0 SHA256 fbf4f2bf7826cabf2072f6c113b3616c1dffd580864d708e344b5f334f1a8a38
-AUX site.config.m4 533 RMD160 cd1a792c111bf3b36c99064ed1e72b31524e4b65 SHA1 cd7623fde25206c8ee41e4c39618e1b50ce14623 SHA256 1abb2d5d18b1ed94af9945985dc263277229a2a3f370f73df0a2fa23ba536f6b
+AUX site.config.m4 564 RMD160 5e27f44c72947cdb4f00aaed618691db5a1c9489 SHA1 df71882eb8b19f7779ae349d07665849aa6c2781 SHA256 3a7d586f8dfc24f7ed53621c04374aeca91153ded80cf17411ce417a45aade44
 DIST sendmail.8.13.6.tar.gz 1986576 RMD160 cbb0649b5dec8e4b4850c76ad4a132a15335df3b SHA1 6c35f4780bd9fc5f8982977ad699752e2ccb26d0 SHA256 68764cf48a6cdab3786791e3a4b0cd19941a18b083d4c53a362e4026f4c72a7a
 DIST sendmail.8.13.7.tar.gz 2010008 RMD160 a1cab6a7f015bf50c1773a67f35b800c751d55ed SHA1 b70f63f5d577e14794d1a37ef5e825f9127ec996 SHA256 4ed72f2cd43e2ab492c91248319c03e224a272a4d683cfc4c3ee484a79471b22
 DIST sendmail.8.13.8.tar.gz 2010975 RMD160 a5d333b073d681f056421e836df4067f331a8ac8 SHA1 8e97c10f52efe5204c08f6cb3f90c08e077ac505 SHA256 48262059aec2d2f1cbbb45dcd4eaf5eb3ba02bc29ebc25c15ae2e04b606f0123
@@ -25,14 +25,14 @@ EBUILD sendmail-8.13.8.ebuild 6700 RMD160 e114ad1f04a14f465f7c90237848a7a80f9aa0
 EBUILD sendmail-8.14.0.ebuild 6699 RMD160 cbb20359863bbe66e3b28bdf1dd7c8d7c6102156 SHA1 aaa85bf761663c98f743d397cddd1650622d5b73 SHA256 de704080ecf447a900af24019277879795ea10741bc38fc6adedce996375ceae
 EBUILD sendmail-8.14.1.ebuild 6709 RMD160 8a78a23aa9e37d2f15ccce4eb35c31bf487cea16 SHA1 b67fdca54f60ea573ac3449144208cb9c6e1601c SHA256 a444ece752a6e6c66af81da9974ab1b3ec18b179c08f7c2f84db05db1aa50b56
 EBUILD sendmail-8.14.2.ebuild 6709 RMD160 0c4f376fddd606dc383882a94e5013ea2eaccf6b SHA1 fbe96a01c7a54e9e3b396f6f6106957a889b4a2c SHA256 faa96d34d4a60ff612eb2f0ce8a72b37d65900583b9125dd0e783cca153b2918
-EBUILD sendmail-8.14.3-r1.ebuild 7433 RMD160 a0dd572b834c300ee36489ad16d82f8bbef1c8ab SHA1 8ff169fd04a27c14331f1f2d98d44b1ad1e2b990 SHA256 f83d4f68bc37bf7f03986af9150e98cf55b34facaa9726357b3907a7e0909ed2
+EBUILD sendmail-8.14.3-r1.ebuild 7486 RMD160 994916daa4beca766cbd41b81353f6829cb1f460 SHA1 b075f14580ef503f5935ee2774bee35feb63c170 SHA256 d645394f0337805c571f12dec71fe9c9f07b2e2a0d7353f75a28fd0f06d0ff91
 EBUILD sendmail-8.14.3.ebuild 6711 RMD160 d48b7269777391eccb074b457069460f9ffda9e7 SHA1 4b36a1a693a6ab586ea29f62a3624268d4c75019 SHA256 8fbaa6142676fdc885a74c3aacf3e3413faa7dd2e359db465e4ddaf35fb4e91f
 MISC ChangeLog 18642 RMD160 f4644b2a67dddddad42ff45f6ffafb5e793f6605 SHA1 06b22f08a3c39d9047e5e0954b48d2fbda40c0f8 SHA256 4861ae20722e60cff5f2c0a536f7c7ec05c34e9e221b612eee0bb24433431ae4
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqQZhAACgkQ9A5kJBGSrstHQgCdF4E9A0h0F0ihIxuwv0CajqK1
-/tkAn2QPRN8Q5B4wEHSmZIuYCfz/+Ipn
-=/0j8
+iEYEARECAAYFAkqQczEACgkQ9A5kJBGSrsvpkwCfaGRgfkA/Mlq5DIMdZtdyuqvs
+9M8An3arPl7SL7ThCJKPhMYXj9iPgot0
+=iqWM
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/files/site.config.m4 b/mail-mta/sendmail/files/site.config.m4
index 470d3cfc32d3..a9e0883a9b00 100644
--- a/mail-mta/sendmail/files/site.config.m4
+++ b/mail-mta/sendmail/files/site.config.m4
@@ -6,6 +6,7 @@ define(`confSTDIO_TYPE', `portable')
 define(`confLDOPTS', `-Wl,-z,now @@confLDOPTS@@')
 define(`confLDOPTS_SO', `-shared')
 define(`confCCOPTS_SO', `-fPIC')
+define(`confCC', `@@confCC@@')
 define(`confMANOWN', `root')
 define(`confMANGRP', `root')
 define(`confMANMODE', `644')
diff --git a/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild b/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild
index 6e030c3735f5..9e3aea9dbe6f 100644
--- a/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.3-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/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild,v 1.1 2009/08/22 21:41:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild,v 1.2 2009/08/22 22:37:26 mrness Exp $
 
 EAPI="2"
 
@@ -49,10 +49,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
 	epatch "${FILESDIR}"/libmilter-sharedlib.patch
 
-	confCCOPTS="${CFLAGS}"
-	confLDOPTS="${LDFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
+	local confCC="$(tc-getCC)"
+	local confCCOPTS="${CFLAGS}"
+	local confLDOPTS="${LDFLAGS}"
+	local confMAPDEF="-DMAP_REGEX"
+	local conf_sendmail_LIBS=""
 	use sasl && confLIBS="${confLIBS} -lsasl2"  \
 		&& confENVDEF="${confENVDEF} -DSASL=2" \
 		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
@@ -69,6 +70,7 @@ src_prepare() {
 	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
 	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
 		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
+		-e "s/@@confCC@@/${confCC}/" \
 		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
 		-e "s/@@confENVDEF@@/${confENVDEF}/" \
 		-e "s/@@confLIBS@@/${confLIBS}/" \
@@ -77,9 +79,9 @@ src_prepare() {
 }
 
 src_compile() {
-	sh Build CC="$(tc-getCC)"|| die "compilation failed in main Build script"
+	sh Build || die "compilation failed in main Build script"
 	pushd libmilter
-	sh Build MILTER_SOVER=${LIBMILTER_VER} CC="$(tc-getCC)"|| die "libmilter compilation failed"
+	sh Build MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
 	popd
 }