[patch] Implement the src_configure()

portage-adddefaultconfigureusewiths.patch (text/plain), 1.55 KB, created by Thomas Anderson (tanderson) (RETIRED) on 2008-09-06 17:25:54 UTC

Index: bin/ebuild.sh
===================================================================
--- bin/ebuild.sh	(revision 11495)
+++ bin/ebuild.sh	(working copy)
@@ -516,8 +516,15 @@
 			--datadir=/usr/share \
 			--sysconfdir=/etc \
 			--localstatedir=/var/lib \
+			"${DEFAULT_SRC_CONFIGURE_PARAMS[@]}" \
+			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_ENABLES[@]}" ; do \
+				use_enable ${s} ; \
+			done )
+			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_WITHS[@]}" ; do \
+				use_with ${s} ; \
+			done )
 			"$@" \
-			${LOCAL_EXTRA_ECONF}
+			${LOCAL_EXTRA_ECONF} \
 
 		if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
 			--prefix=/usr \
@@ -527,6 +534,13 @@
 			--datadir=/usr/share \
 			--sysconfdir=/etc \
 			--localstatedir=/var/lib \
+			"${DEFAULT_SRC_CONFIGURE_PARAMS[@]}" \
+			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_ENABLES[@]}" ; do \
+				use_enable ${s} ; \
+			done )
+			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_WITHS[@]}" ; do \
+				use_with ${s} ; \
+			done )
 			"$@"  \
 			${LOCAL_EXTRA_ECONF}; then
 
@@ -629,13 +643,20 @@
 
 _eapi2_src_configure() {
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
+		if [ ${EAPI} != 2 ]; then
+			unset $DEFAULT_SRC_CONFIGURE_USE_ENABLES
+			unset $DEFAULT_SRC_CONFIGURE_USE_WITHS
+		fi
 		econf
 	fi
 }
 
 _eapi2_src_compile() {
 	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake || die "emake failed"
+		if [ ${EAPI} != 2 ]; then
+			unset ${DEFAULT_SRC_COMPILE_EMAKE_PARAMS}
+		fi
+		emake "${DEFAULT_SRC_COMPILE_EMAKE_PARAMS[@]}"|| die "emake failed"
 	fi
 }