[patch] eclass/apache-2.eclass diff

apache-2-BJA-cross.diff (text/plain), 1.59 KB, created by Bertrand Jacquin on 2011-10-05 20:22:56 UTC

--- /usr/portage/eclass/apache-2.eclass	2011-07-08 14:01:13.000000000 +0200
+++ apache-2.eclass	2011-10-05 22:16:49.000000000 +0200
@@ -390,6 +390,8 @@
 # This function applies patches, configures a custom file-system layout and
 # rebuilds the configure scripts.
 apache-2_src_prepare() {
+	tc-export CC
+
 	# 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
 	# idea for everyone
 	case ${CHOST} in
@@ -452,9 +454,9 @@
 		--sysconfdir=/etc/apache2 \
 		--localstatedir=/var \
 		--with-mpm=${MY_MPM} \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
+		--with-apr=${ROOT}usr \
+		--with-apr-util=${ROOT}usr \
+		--with-pcre=${ROOT}usr \
 		--with-z=/usr \
 		--with-port=80 \
 		--with-program-name=apache2 \
@@ -464,12 +466,21 @@
 	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
 }
 
+# @FUNCTION: apache-2_src_compile
+apache-2_src_compile() {
+	emake \
+		LIBTOOL="${ROOT}usr/bin/libtool" \
+		|| die "emake failed"
+}
+
 # @FUNCTION: apache-2_src_install
 # @DESCRIPTION:
 # This function runs `emake install' and generates, installs and adapts the gentoo
 # specific configuration files found in the tarball
 apache-2_src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" \
+		LIBTOOL="${ROOT}usr/bin/libtool" \
+		install || die "make install failed"
 
 	# install our configuration files
 	keepdir /etc/apache2/vhosts.d
@@ -577,4 +588,4 @@
 
 }
 
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst