| 1 |
mrness 09/08/22 22:37:26 |
| 2 |
|
| 3 |
Modified: sendmail-8.14.3-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix gcc command used for linking libmilter.so |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 mail-mta/sendmail/sendmail-8.14.3-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: sendmail-8.14.3-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- sendmail-8.14.3-r1.ebuild 22 Aug 2009 21:41:23 -0000 1.1 |
| 22 |
+++ sendmail-8.14.3-r1.ebuild 22 Aug 2009 22:37:26 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
|
| 31 |
@@ -49,10 +49,11 @@ |
| 32 |
epatch "${FILESDIR}"/sendmail-delivered_hdr.patch |
| 33 |
epatch "${FILESDIR}"/libmilter-sharedlib.patch |
| 34 |
|
| 35 |
- confCCOPTS="${CFLAGS}" |
| 36 |
- confLDOPTS="${LDFLAGS}" |
| 37 |
- confMAPDEF="-DMAP_REGEX" |
| 38 |
- conf_sendmail_LIBS="" |
| 39 |
+ local confCC="$(tc-getCC)" |
| 40 |
+ local confCCOPTS="${CFLAGS}" |
| 41 |
+ local confLDOPTS="${LDFLAGS}" |
| 42 |
+ local confMAPDEF="-DMAP_REGEX" |
| 43 |
+ local conf_sendmail_LIBS="" |
| 44 |
use sasl && confLIBS="${confLIBS} -lsasl2" \ |
| 45 |
&& confENVDEF="${confENVDEF} -DSASL=2" \ |
| 46 |
&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \ |
| 47 |
@@ -69,6 +70,7 @@ |
| 48 |
use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP" |
| 49 |
sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \ |
| 50 |
-e "s/@@confLDOPTS@@/${confLDOPTS}/" \ |
| 51 |
+ -e "s/@@confCC@@/${confCC}/" \ |
| 52 |
-e "s/@@confMAPDEF@@/${confMAPDEF}/" \ |
| 53 |
-e "s/@@confENVDEF@@/${confENVDEF}/" \ |
| 54 |
-e "s/@@confLIBS@@/${confLIBS}/" \ |
| 55 |
@@ -77,9 +79,9 @@ |
| 56 |
} |
| 57 |
|
| 58 |
src_compile() { |
| 59 |
- sh Build CC="$(tc-getCC)"|| die "compilation failed in main Build script" |
| 60 |
+ sh Build || die "compilation failed in main Build script" |
| 61 |
pushd libmilter |
| 62 |
- sh Build MILTER_SOVER=${LIBMILTER_VER} CC="$(tc-getCC)"|| die "libmilter compilation failed" |
| 63 |
+ sh Build MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed" |
| 64 |
popd |
| 65 |
} |
Archives