[patch] patch for gcc-config to make it independent of portage

gcc-config.patch (text/plain), 1.31 KB, created by Thomas Witt on 2013-04-03 18:47:04 UTC

--- gcc-config
+++ gcc-config
@@ -115,6 +115,17 @@
 	fi
 }
 
+get_chost_paludis() {
+	local varname=${1:-CHOST}
+	local conf=$(cave print-environment-metadata --raw-name conf_dir --format "%v")/bashrc
+	local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname})
+
+	if [[ -n ${ret} ]] ; then
+		echo ${ret}
+		return 0
+	fi
+}
+
 get_chost() {
 	# If it's set in the env, trust the setting.  If it's wrong,
 	# then that's the caller's problem.
@@ -122,6 +133,12 @@
 
 	export CHOST
 
+	# check for paludis
+	if [[ ${PACKAGE_MANAGER} == paludis ]]; then
+		CHOST=$(get_chost_paludis)
+		return 0
+	fi
+
 	# make sure portage isnt broken
 	if python -V &>/dev/null ; then
 		CHOST=$(portageq envvar CHOST 2>/dev/null)
@@ -453,9 +470,15 @@
 	   [[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]]
 	then
 		# in case python is broken ...
-		if ! env-update ; then
+		if [[ -x /usr/bin/env-update ]]; then
+			ENV_UPDATE_COMMAND="env-update"
+		else
+			ENV_UPDATE_COMMAND="eselect env update"
+		fi
+
+		if ! ${ENV_UPDATE_COMMAND} ; then
 			echo ""
-			ewarn "env-update failed to work properly; making sure ld.so.conf paths"
+			ewarn "${ENV_UPDATE_COMMAND} failed to work properly; making sure ld.so.conf paths"
 			ewarn "are setup properly.  Please rerun gcc-config with the -f option."
 			echo ""
 			if [[ ! -d /etc/ld.so.conf.d ]] ; then