[patch] mail-mta/exim-4.69.ebuild.diff

exim-4.69.diff (text/plain), 1.95 KB, created by Bertrand Jacquin on 2009-04-18 15:44:36 UTC

--- /usr/portage/mail-mta/exim/exim-4.69.ebuild	2009-04-05 10:08:24.000000000 +0200
+++ exim-4.69.ebuild	2009-04-18 17:41:13.000000000 +0200
@@ -38,6 +38,7 @@
 	sqlite? ( dev-db/sqlite )
 	radius? ( net-dialup/radiusclient )
 	domainkeys? ( mail-filter/libdomainkeys )
+	virtual/libiconv
 	"
 	# added X check for #57206
 RDEPEND="${DEPEND}
@@ -54,6 +55,7 @@
 
 	epatch "${FILESDIR}"/exim-4.14-tail.patch
 	epatch "${FILESDIR}"/exim-4.43-r2-localscan_dlopen.patch
+	epatch "${FILESDIR}"/exim-BJA-buildconfig-HOSTCC.diff
 
 	if ! use mbox; then
 		einfo "Patching maildir support into exim.conf"
@@ -152,6 +154,8 @@
 		echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile
 	fi
 
+	echo "CC=$(tc-getCC ${CBUILD})" >> Makefile
+
 	cd "${S}"
 	if use ssl; then
 		sed -i \
@@ -173,24 +177,24 @@
 		sed -i \
 			-e "s:# \(LOOKUP_LDAP=yes\):\1:" \
 			-e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile
-		LOOKUP_INCLUDE="-I/usr/include/ldap"
-		LOOKUP_LIBS="-L/usr/lib -lldap -llber"
+		LOOKUP_INCLUDE="-I${ROOT}/usr/include/ldap"
+		LOOKUP_LIBS="-L${ROOT}/usr/$(get_libdir) -lldap -llber"
 	fi
 
 	if use mysql; then
 		sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql"
-		LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${ROOT}/usr/include/mysql"
+		LOOKUP_LIBS="$LOOKUP_LIBS -L${ROOT}/usr/$(get_libdir) -lmysqlclient"
 	fi
 
 	if use postgres; then
 		sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${ROOT}/usr/include/postgresql"
 		LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
 	fi
 	if use sqlite; then
 		sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile
-		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite"
+		LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I${ROOT}/usr/include/sqlite"
 		LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
 	fi
 	if [ -n "$LOOKUP_INCLUDE" ]; then