add --print-environ; other fixes

4 files changed, 442 insertions, 1 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 1730925e032a..cecc0d9106f7 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.9 2002/12/17 13:06:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.10 2002/12/23 01:49:50 azarah Exp $
+
+*gcc-config-1.2.5 (23 Dec 2002)
+
+  23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.5.ebuild :
+
+  Add --print-environ switch.  Add /usr/bin/cpp wrapper.  Fix the wrapper
+  to setup PATH if it cannot find cpp, or if 'which cpp' give /usr/bin/cpp.
 
   17 Dec 2002; Martin Schlemmer <azarah@gentoo.org> gcc-config-1.2.4 :
 
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.2.5 b/sys-devel/gcc-config/files/digest-gcc-config-1.2.5
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.2.5
diff --git a/sys-devel/gcc-config/files/gcc-config-1.2.5 b/sys-devel/gcc-config/files/gcc-config-1.2.5
new file mode 100644
index 000000000000..4d034dadb960
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.2.5
@@ -0,0 +1,384 @@
+#!/bin/bash
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.2.5,v 1.1 2002/12/23 01:49:50 azarah Exp $
+
+
+source /etc/init.d/functions.sh || {
+	echo "$0: Could not source /etc/init.d/functions.sh!"
+	exit 1
+}
+
+usage() {
+cat << "USAGE_END"
+Usage: gcc-config [Option] <CHOST>-<gcc version>
+Options:
+	[--use-old]
+
+		Use the old profile if one was selected.
+	
+	[--use-portage-chost]
+
+		Only set to given profile if its CHOST is the same as that
+		set for portage in /etc/make.conf (or one of other portage
+		config files...).
+	
+	[--get-current-profile]
+
+		Print current used gcc profile.
+
+	[--list-profiles]
+
+	    Print a list of available profiles.
+
+	[--print-environ]
+
+	    Print environment that can be used to setup things for current
+		gcc profile, or specified one ...
+	
+	[--get-bin-path]
+
+		Print path where binaries of given/current profile are located.
+	
+	[--get-lib-path]
+
+		Print path where libraries of given/current profile are located.
+
+	[--get-stdcxx-incdir]
+
+		Print path to g++ include files of given/current profile.
+	
+
+USAGE_END
+
+	exit 1
+}
+
+if [ "$#" -lt 1 ]
+then
+	usage
+fi
+
+cmd_setup() {
+
+	# Sourcing /etc/env.d/gcc/${GCC_COMP} is going to mess up
+	# PATH among things...
+	CP="$(find_path cp)"
+	RM="$(find_path rm)"
+	MV="$(find_path mv)"
+	LN="$(find_path ln)"
+	CAT="$(find_path cat)"
+	AWK="$(find_path gawk)"
+	GREP="$(find_path grep)"
+	FIND="$(find_path find)"
+	CHMOD="$(find_path chmod)"
+	TOUCH="$(find_path touch)"
+	ENV_UPDATE="$(find_path env-update)"
+}
+
+find_path() {
+	[ -z "$1" ] && return 0
+
+	for x in /bin /sbin /usr/bin /usr/sbin
+	do
+		if [ -x ${x}/$1 -a -r ${x}/$1 ]
+		then
+			echo "${x}/$1"
+			break
+		fi
+	done
+}
+
+gen_wrapper() {
+	${CAT} > $1 << END
+#!/bin/sh
+
+# This is part of sys-devel/gcc-config
+
+CPP="\`which cpp 2> /dev/null\`"
+
+# Setup PATH if we cannot find the cpp binary, or if the one
+# we find is the wrapper script ...
+if [ ! -x "\${CPP}" -o "\${CPP}" == "/usr/bin/cpp" ]
+then
+	PATH="\`/usr/sbin/gcc-config --get-bin-path\`:\${PATH}"
+fi
+
+$2 "\$@"
+END
+
+	${CHMOD} 0755 $1
+}
+
+GCC_COMP=""
+REAL_CHOST="$(/usr/bin/python -c 'import portage; print portage.settings["CHOST"];')"
+
+switch_profile() {
+	local MY_LDPATH=""
+	local GCC_PROFILES=""
+
+	if [ "$(id -u)" -ne 0 ]
+	then
+		eerror "$0: Must be root."
+		exit 1
+	fi
+
+	ebegin "Switching to ${GCC_COMP} compiler"
+
+	# Sourcing /etc/env.d/gcc/${GCC_COMP} is going to mess up
+	# PATH among things...
+	cmd_setup
+
+	# Order our profiles to have the default first...
+	# We do this so that we can have them ordered with default
+	# first in /etc/ld.so.conf, as the logical is that all
+	# compilers for default CHOST will be used to compile stuff,
+	# and thus we want all their lib paths in /etc/ld.so.conf ...
+	GCC_PROFILES="$(${FIND} /etc/env.d/gcc/ -name "${REAL_CHOST}-*")"
+	GCC_PROFILES="${GCC_PROFILES/\/etc\/env.d\/gcc\/${GCC_COMP}}"
+	GCC_PROFILES="/etc/env.d/gcc/${GCC_COMP} ${GCC_PROFILES}"
+
+	# Extract all LDPATH's for our CHOST
+	for x in ${GCC_PROFILES}
+	do
+		if [ -f ${x} ]
+		then
+			source ${x}
+
+			if [ -z "${MY_LDPATH}" ]
+			then
+				if [ -d ${LDPATH} ]
+				then
+					MY_LDPATH="${LDPATH}"
+				fi
+			else
+				if [ -d ${LDPATH} ]
+				then
+					MY_LDPATH="${MY_LDPATH}:${LDPATH}"
+				fi
+			fi
+		fi
+	done
+
+	# Setup /etc/env.d/05gcc
+	${AWK} '!/STDCXX_INCDIR|LDPATH/ {print $0}' \
+		/etc/env.d/gcc/${GCC_COMP} > /etc/env.d/05gcc
+	echo "LDPATH=\"${MY_LDPATH}\"" >> /etc/env.d/05gcc
+
+	source /etc/env.d/gcc/${GCC_COMP}
+
+	# Create /lib/cpp if missing or a symlink
+	if [ -L /lib/cpp -o ! -f /lib/cpp ]
+	then
+		${RM} -f /lib/cpp
+		gen_wrapper /lib/cpp cpp
+	fi
+	# Make sure it are not unmerged by mistake
+	${TOUCH} /lib/cpp
+	# Create /usr/bin/cc if missing or a symlink
+	if [ -L /usr/bin/cc -o ! -f /usr/bin/cc ]
+	then
+		${RM} -f /usr/bin/cc
+		gen_wrapper /usr/bin/cc gcc
+	fi
+	# Make sure it are not unmerged by mistake
+	${TOUCH} /usr/bin/cc
+	# Create /usr/bin/cpp if missing or a symlink (used by XFree86 for one)
+	if [ -L /usr/bin/cpp -o ! -f /usr/bin/cpp ]
+	then
+		${RM} -f /usr/bin/cpp
+		gen_wrapper /usr/bin/cpp cpp
+	fi
+	# Make sure it are not unmerged by mistake
+	${TOUCH} /usr/bin/cpp
+
+	echo "CURRENT=${GCC_COMP}" > /etc/env.d/gcc/config
+
+	source /etc/profile
+
+	${ENV_UPDATE} &> /dev/null
+
+	eend 0
+
+	return 0
+}
+
+get_current_profile() {
+	if [ ! -f /etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	source /etc/env.d/gcc/config
+
+	if [ -z "${CURRENT}" ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	echo "${CURRENT}"
+
+	return 0
+}
+
+list_profiles() {
+	if [ ! -f /etc/env.d/gcc/config ]
+	then
+		eerror "$0:  No gcc profile is active!"
+		return 1
+	fi
+
+	for x in /etc/env.d/gcc/*
+	do
+		if [ -f ${x} -a ${x} != "/etc/env.d/gcc/config" ]
+		then
+			echo "${x##*/}"
+		fi
+	done
+}
+
+print_environ() {
+	local OLDPATH="${PATH}"
+
+	source /etc/env.d/gcc/${GCC_COMP}
+
+	echo "export PATH=\"${PATH}:${OLDPATH}\""
+
+#	if [ -z "${LD_LIBRARY_PATH}" ]
+#	then
+#		echo "export LD_LIBRARY_PATH=\"${LDPATH}\""
+#	else
+#		echo "export LD_LIBRARY_PATH=\"${LDPATH}:${LD_LIBRARY_PATH}\""
+#	fi
+
+	echo "export CC=\"${CC}\""
+	echo "export CXX=\"${CXX}\""
+}
+
+get_bin_path() {
+	source /etc/env.d/gcc/${GCC_COMP}
+
+	echo "${PATH}"
+
+	return 0
+}
+
+get_lib_path() {
+	source /etc/env.d/gcc/${GCC_COMP}
+
+	echo "${LDPATH}"
+
+	return 0
+}
+
+get_stdcxx_incdir() {
+	source /etc/env.d/gcc/${GCC_COMP}
+
+	echo "${LDPATH}/include/${STDCXX_INCDIR}"
+
+	return 0
+}
+
+NEED_ACTION="yes"
+DOIT="switch_profile"
+CHECK_CHOST="no"
+
+for x in $*
+do
+	case ${x} in
+		# Only use specified compiler if one is not already selected.
+		--use-old)
+			if get_current_profile &> /dev/null
+			then
+				GCC_COMP="$(get_current_profile)"
+			fi
+			;;
+		--use-portage-chost)
+			CHECK_CHOST="yes"
+			;;
+		--get-current-profile)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_current_profile"
+			fi
+			;;
+		--list-profiles)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="list_profiles"
+			fi
+			;;
+		--print-environ)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="print_environ"
+			fi
+			;;
+		--get-bin-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_bin_path"
+			fi
+			;;
+		--get-lib-path)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_lib_path"
+			fi
+			;;
+		--get-stdcxx-incdir)
+			if [ "${NEED_ACTION}" = "yes" ]
+			then
+				NEED_ACTION="no"
+				DOIT="get_stdcxx_incdir"
+			fi
+			;;
+		*)
+			if [ -z "${GCC_COMP}" ]
+			then
+				GCC_COMP="${x}"
+			fi
+			;;
+	esac
+done
+
+if [ "${DOIT}" = "switch_profile" -a -z "${GCC_COMP}" ]
+then
+	usage
+fi
+
+if [ -z "${GCC_COMP}" ]
+then
+	if get_current_profile &> /dev/null
+	then
+		GCC_COMP="$(get_current_profile)"
+	else
+		usage
+	fi
+fi
+
+if [ ! -d /usr/lib/gcc-lib/${GCC_COMP%-*}/${GCC_COMP##*-} -o \
+     ! -f /etc/env.d/gcc/${GCC_COMP} ]
+then
+	usage
+fi
+
+# Chosen CHOST are not the same as the real CHOST according to make.conf,
+# and --use-portage-chost option was given, so do nothing ...
+if [ "${CHECK_CHOST}" = "yes" -a "${GCC_COMP%-*}" != "${REAL_CHOST}" ]
+then
+	exit 0
+fi
+
+eval ${DOIT}
+
+
+# vim:ts=4
diff --git a/sys-devel/gcc-config/gcc-config-1.2.5.ebuild b/sys-devel/gcc-config/gcc-config-1.2.5.ebuild
new file mode 100644
index 000000000000..3019ee560f93
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.2.5.ebuild,v 1.1 2002/12/23 01:49:50 azarah Exp $
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Utility to change the gcc compiler being used."
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+
+KEYWORDS="x86 ppc sparc alpha"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc"
+
+
+src_install() {
+
+	newsbin ${FILESDIR}/${PN}-${PV} ${PN}
+}
+
+pkg_postinst() {
+
+	# Do we have a valid multi ver setup ?
+	if ${ROOT}/usr/sbin/gcc-config --get-current-profile > /dev/null
+	then
+		# /usr/bin/cpp borks things if present ...
+		if [ -L ${ROOT}/usr/bin/cpp -o -f ${ROOT}/usr/bin/cpp ]
+		then
+			rm -f ${ROOT}/usr/bin/cpp
+		fi
+
+		# We not longer use the /usr/include/g++-v3 hacks, as
+		# it is not needed ...
+		if [ -L ${ROOT}/usr/include/g++ ]
+		then
+			rm -f ${ROOT}/usr/include/g++
+		fi
+		if [ -L ${ROOT}/usr/include/g++-v3 ]
+		then
+			rm -f ${ROOT}/usr/include/g++-v3
+		fi
+
+		if [ ${ROOT} = "/" ]
+		then
+			/usr/sbin/gcc-config $(/usr/sbin/gcc-config --get-current-profile)
+		fi
+	fi
+}
+