push ABI changes into 1.3.9 so 1.3.8 can go stable
authorMike Frysinger <vapier@gentoo.org>
Wed, 29 Dec 2004 01:05:58 +0000 (01:05 +0000)
committerMike Frysinger <vapier@gentoo.org>
Wed, 29 Dec 2004 01:05:58 +0000 (01:05 +0000)
sys-devel/gcc-config/Manifest
sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r3 [moved from sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r2 with 100% similarity]
sys-devel/gcc-config/files/digest-gcc-config-1.3.9 [new file with mode: 0644]
sys-devel/gcc-config/files/gcc-config-1.3.8
sys-devel/gcc-config/files/gcc-config-1.3.9 [new file with mode: 0755]
sys-devel/gcc-config/files/wrapper-1.4.3.c [new file with mode: 0644]
sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild [new file with mode: 0644]
sys-devel/gcc-config/gcc-config-1.3.9.ebuild [moved from sys-devel/gcc-config/gcc-config-1.3.8-r2.ebuild with 94% similarity]

index d7bc00950dfc5559639afe5987c712ebafd8ed7b..a86b9ca82b145759fcf1b9588323aedf9d25bc6e 100644 (file)
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 0b8a51c11885531a2411c0ca751095f2 gcc-config-1.3.9.ebuild 1370
 MD5 236509b94e2d78bf9d6cba5820706867 ChangeLog 14600
 MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636
-MD5 626c17691d48b229f5c619618bf365c0 gcc-config-1.3.7-r6.ebuild 1395
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 cab2e8d259183adfe9f2d3d04273b8ca gcc-config-1.3.8-r2.ebuild 1363
-MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132
+MD5 626c17691d48b229f5c619618bf365c0 gcc-config-1.3.7-r6.ebuild 1395
+MD5 84d0ca7a875fc1a7a353ab8f0f71792e gcc-config-1.3.8-r3.ebuild 1359
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0
-MD5 0c96b0464e9cec87312b5fa06d8c138b files/gcc-config-1.3.7 11800
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r6 0
-MD5 00229104aa2309d104a1d9dddea67849 files/gcc-config-1.3.8 12330
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r2 0
 MD5 11d24a6f5defba5a8a8bbc65f26e2215 files/wrapper-1.4.2.c 7439
 MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285
+MD5 e8a654e548e74887bcd99ed224a9efca files/gcc-config-1.3.9 12326
+MD5 0c96b0464e9cec87312b5fa06d8c138b files/gcc-config-1.3.7 11800
+MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.9 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r6 0
+MD5 081d4327e878875cbebc11e8ebb0cbec files/gcc-config-1.3.8 12381
+MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r3 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB0PA4ArHZZzCEUG0RArMtAJ91pyAhxyZdfqonGozrJ1DyOM/vpwCfUiaH
-1ZbnufUbA81L2LyHpKyQrMs=
-=7tSd
+iD8DBQFB0gMProRuSHgZdywRAromAJ9YldSIf3aStVHRg+WUojlGK0weuQCdEZvJ
+BlVTyT89O+Y6gYCq1mk6Iek=
+=djGr
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.9 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.9
new file mode 100644 (file)
index 0000000..e69de29
index 382fc6717f5c96e8aceeb8305b0b2f1ea5fa141b..402c76a6caf31e930a828848c4f461b90ac527fb 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.3 2004/12/28 05:32:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.4 2004/12/29 01:05:58 vapier Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -212,8 +212,9 @@ switch_profile() {
                        # This should probably get folded back into the wrapper ...
                        if [[ ${x:${#x}-3} = "gcc" ]] || [[ ${x:${#x}-3} = "g++" ]] ; then
                                for bits in ${GCCBITS} ; do
-                                       cp -f "${ROOT}/usr/lib/gcc-config/wrapper" \
-                                               "${ROOT}/usr/bin/${x}${bits}"
+                                       echo "#!/bin/sh"$'\n'"exec ${x} -m${bits} \"\$@\"" \
+                                               > "${ROOT}/usr/bin/${x}${bits}"
+                                       chmod 755 "${ROOT}/usr/bin/${x}${bits}"
                                done
                        fi
                fi
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.9 b/sys-devel/gcc-config/files/gcc-config-1.3.9
new file mode 100755 (executable)
index 0000000..bdd7550
--- /dev/null
@@ -0,0 +1,490 @@
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.9,v 1.1 2004/12/29 01:05:58 vapier Exp $
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+
+trap ":" INT QUIT TSTP
+
+source /etc/init.d/functions.sh || {
+       echo "$0: Could not source /etc/init.d/functions.sh!"
+       exit 1
+}
+umask 022
+
+usage() {
+cat << "USAGE_END"
+Usage: gcc-config [options] [CC Profile]
+Change the current cc/gcc profile, or give info about profiles.
+
+Options:
+  -O, --use-old              Use the old profile if one was selected.
+  -P, --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...).
+  -c, --get-current-profile  Print current used gcc profile.
+  -l, --list-profiles        Print a list of available profiles.
+  -E, --print-environ        Print environment that can be used to setup the
+                             current gcc profile, or a specified one.
+  -B, --get-bin-path         Print path where binaries of the given/current
+                             profile are located.
+  -L, --get-lib-path         Print path where libraries of the given/current
+                             profile are located.
+  -X, --get-stdcxx-incdir    Print path where g++ include files of the
+                             given/current profile are located.
+
+Profile names are of the form:  <CHOST>-<gcc version>
+For example:                    i686-pc-linux-gnu-3.2.1
+USAGE_END
+       exit $1
+}
+[[ $# -lt 1 ]] && usage 1
+
+find_path() {
+       [[ -z $1 ]] && return 0
+
+       local fullpath="$(type -P $1)"
+       
+       if [[ -x ${fullpath} ]] ; then
+               echo "${fullpath}"
+               return 0
+       fi
+
+       for x in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin ; do
+               if [[ -x ${x}/$1 ]] && [[ -r ${x}/$1 ]] ; then
+                       echo "${x}/$1"
+                       return 0
+               fi
+       done
+
+       return 0
+}
+
+cmd_setup() {
+       # Sourcing /etc/env.d/gcc/${CC_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)"
+}
+
+get_real_chost() {
+       [[ -n ${REAL_CHOST} ]] && return 0
+
+       export REAL_CHOST="$(env -u CHOST portageq envvar CHOST)"
+
+       if [[ -z ${REAL_CHOST} ]] ; then
+               eerror "$0: Could not get portage CHOST!"
+               return 1
+       fi
+}
+
+is_cross_compiler() {
+       get_real_chost
+       [[ ${CC_COMP/${REAL_CHOST}} = ${CC_COMP} ]]
+}
+
+switch_profile() {
+       local MY_LDPATH=
+       local GCC_PROFILES=
+       local OLD_CC_COMP=
+       local GCC_BIN_PATH=
+
+       if [[ "$(id -u)" -ne 0 ]] ; then
+               eerror "$0: Must be root."
+               exit 1
+       fi
+
+       ebegin "Switching to ${CC_COMP} compiler"
+
+       # Sourcing /etc/env.d/gcc/${CC_COMP} is going to mess up
+       # PATH among things...
+       cmd_setup
+
+       if ! is_cross_compiler ; then
+               # 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 ...
+               get_real_chost
+               GCC_PROFILES="$(${FIND} "${GCC_ENV_D}" -name "${REAL_CHOST}-*" -a ! -name "${CC_COMP}")"
+               GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}"
+
+               # Extract all LDPATH's for our CHOST
+               MY_LDPATH=""
+               for x in ${GCC_PROFILES} ; do
+                       if [[ -f ${x} ]] ; then
+                               source "${x}"
+
+                               # Handle LDPATH's that have multiple directories
+                               local old_IFS="${IFS}"
+                               export IFS=":"
+                               local sub_ldpath=
+                               for sub_ldpath in ${LDPATH} ; do
+                                       if [[ -d ${sub_ldpath} ]] ; then
+                                               if [[ ${MY_LDPATH/:${sub_ldpath}} = ${MY_LDPATH} ]] ; then
+                                                       MY_LDPATH="${MY_LDPATH}:${sub_ldpath}"
+                                               fi
+                                       fi
+                               done
+                               export IFS="${old_IFS}"
+                       fi
+               done
+               MY_LDPATH="${MY_LDPATH:1}" # trim leading :
+       fi
+
+       # Setup things properly again for this profile
+       unset GCC_SPECS LDPATH
+       source "${GCC_ENV_D}/${CC_COMP}"
+       OLD_CC_COMP=$(get_current_profile)
+       CTARGET="${CTARGET:-${REAL_CHOST}}"
+
+       # What kind of env.d entry are we going to generate ?
+       if is_cross_compiler ; then
+               # Only keep PATH/ROOTPATH
+               ${AWK} '/^(PATH|ROOTPATH)=/ {print $0}' \
+                       "${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc-${CTARGET}"
+
+               echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}"
+       else
+               # Pass all by default
+               ${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS)=/ {print $0}' \
+                       "${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc"
+               echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc"
+               if [[ -n ${GCC_SPECS} ]] && [[ -e ${ROOT}/${GCC_SPECS} ]] ; then
+                       echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc"
+               else
+                       # People need to rebuild their gcc or setting GCC_SPECS to
+                       # "" will cause issues again :(
+                       if [[ ${ROOT} != "/" ]] ; then
+                               echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+                       else
+                               if ! GCC_SPECS="" /usr/bin/gcc -v &>/dev/null ; then
+                                       echo
+                                       ewarn "Your gcc has a bug with GCC_SPECS."
+                                       ewarn "Please re-emerge gcc."
+                                       ewarn "http://bugs.gentoo.org/show_bug.cgi?id=68395"
+                                       echo
+                               else
+                                       echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+                               fi
+                       fi
+               fi
+
+               echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config"
+       fi
+
+       # Save PATH
+       GCC_BIN_PATH="${PATH}"
+       # Fix environment
+       source /etc/profile
+       umask 022
+
+       # Update the wrappers for this profile
+       local native="gcc cpp cc c++ g++ f77 g77 gcj"
+       is_cross_compiler && native=""
+       for x in ${native} ${CTARGET}-{gcc,c++,g++,f77,g77,gcj} ; do
+               # Make sure we have no stale wrappers
+               ${RM} -f "${ROOT}/usr/bin/${x}"
+               [[ ${x:${#x}-3} = "gcc" || ${x:${#x}-3} = "g++" ]] \
+                       && ${RM} -f "${ROOT}/usr/bin/${x}"{32,64}
+
+               # Only install a wrapper if the binary exists ...
+               # If installing one of the C++ binaries, check to see
+               # if g++ exists so we don't install crappy wrappers
+               if ([[ -x ${ROOT}/${GCC_BIN_PATH}/${x} || ${x} = "cc" ]]) || \
+                  ([[ ${x} = "c++" || ${x} = ${CTARGET}-c++ || ${x} = "cpp" ]] && \
+                   [[ -x ${ROOT}/${GCC_BIN_PATH}/${CTARGET}-g++ ]])
+               then
+                       ${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" \
+                                "${ROOT}/usr/bin/${x}"
+
+                       # Install 32bit and 64bit wrappers if need be
+                       # This should probably get folded back into the wrapper ...
+                       if [[ ${x:${#x}-3} = "gcc" ]] || [[ ${x:${#x}-3} = "g++" ]] ; then
+                               for bits in ${GCCBITS} ; do
+                                       cp -f "${ROOT}/usr/lib/gcc-config/wrapper" \
+                                               "${ROOT}/usr/bin/${x}${bits}"
+                               done
+                       fi
+               fi
+       done
+       # Only install cpp if switching to a native one
+       if ! is_cross_compiler ; then
+               ${RM} -f "${ROOT}/lib/cpp"
+               ${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" "${ROOT}/lib/cpp"
+       fi
+
+       # We need to make sure that libgcc_s.so makes it into /lib.
+       # On many systems (x86/amd64/etc...), this will probably never matter, 
+       # but on other systems (arm/mips/etc...), this is quite critical.
+       # http://bugs.gentoo.org/show_bug.cgi?id=60190
+       if ! is_cross_compiler && [[ -e ${ROOT}/${LDPATH}/libgcc_s.so ]] ; then
+               rm -f "${ROOT}"/lib/libgcc_so.so*
+               cp -a "${ROOT}/${LDPATH}"/libgcc_s.so* "${ROOT}"/lib/
+       fi
+
+       if [[ ${ROOT} = "/" ]] && [[ ${OLD_CC_COMP} != ${CC_COMP} ]] ; then
+               ${ENV_UPDATE} &>/dev/null
+       fi
+
+       eend 0
+
+       if [[ ${ROOT} = "/" ]] && [[ ${OLD_CC_COMP} != ${CC_COMP} ]] ; then
+               echo
+               ewarn "If you intend to use the gcc from the new profile in an already"
+               ewarn "running shell, please remember to do:"
+               echo
+               ewarn "  # source /etc/profile"
+               echo
+       fi
+
+       return 0
+}
+
+get_current_profile() {
+       local conf="${GCC_ENV_D}/config"
+       [[ -n ${CTARGET} ]] && conf="${GCC_ENV_D}/config-${CTARGET}"
+
+       if [[ ! -f ${conf} ]] ; then
+               eerror "$0: No gcc profile is active!"
+               return 1
+       fi
+
+       source "${conf}"
+
+       if [[ -z ${CURRENT} ]] ; then
+               eerror "$0: No gcc profile is active!"
+               return 1
+       fi
+
+       echo "${CURRENT}"
+
+       return 0
+}
+
+list_profiles() {
+       local i=1
+
+       if [[ ! -f ${GCC_ENV_D}/config ]] ; then
+               eerror "$0: No gcc profile is active; please select one!"
+       else
+               get_current_profile >/dev/null
+       fi
+
+       if [[ ${ROOT} != "/" ]] ; then
+               echo "Using gcc-config info in ${ROOT}"
+       fi
+       for x in "${GCC_ENV_D}"/* ; do
+               if [[ -f ${x} ]] && [[ ${x/\/config} = ${x} ]] ; then
+                       x=${x##*/}
+                       [[ ${x} = ${CURRENT} ]] && x="${x} *"
+                       echo "[${i}] ${x}"
+                       i=$((i + 1))
+               fi
+       done
+}
+
+print_environ() {
+       local OLDPATH="${PATH}"
+       local ENV_CMD=
+       local SET_ELEMENT=
+
+       source "${GCC_ENV_D}/${CC_COMP}"
+
+       case ${SHELL} in
+               */csh|*/tsch)
+                       ENV_CMD="setenv"
+                       SET_ELEMENT=" "
+                       ;;
+               *)
+                       ENV_CMD="export"
+                       SET_ELEMENT="="
+                       ;;
+       esac
+
+       echo "${ENV_CMD} PATH${SET_ELEMENT}\"${PATH}:${OLDPATH}\""
+}
+
+get_bin_path() {
+       if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then
+               source "${GCC_ENV_D}/${CC_COMP}"
+               echo "${PATH}"
+       else
+               echo "no-config"
+               echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2
+       fi
+
+       return 0
+}
+
+get_lib_path() {
+       if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then
+               source "${GCC_ENV_D}/${CC_COMP}"
+               echo "${LDPATH}"
+       else
+               echo "no-config"
+               echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2
+       fi
+
+       return 0
+}
+
+get_stdcxx_incdir() {
+       if [[ -e ${GCC_ENV_D}/${CC_COMP} ]] ; then
+               source "${GCC_ENV_D}/${CC_COMP}"
+               echo "${LDPATH}/include/${STDCXX_INCDIR}"
+       else
+               echo "no-config"
+               echo "${GCC_ENV_D}/${CC_COMP} doesnt exist" 1>&2
+       fi
+
+       return 0
+}
+
+NEED_ACTION="yes"
+DOIT="switch_profile"
+CHECK_CHOST="no"
+
+CC_COMP=
+[[ -z ${ROOT} ]] && ROOT="/"
+ENV_D="${ROOT}etc/env.d"
+GCC_ENV_D="${ENV_D}/gcc"
+
+for x in "$@" ; do
+       case "${x}" in
+               # Only use specified compiler if one is not already selected.
+               -O|--use-old)
+                       if get_current_profile &>/dev/null ; then
+                               CC_COMP="$(get_current_profile)"
+                       fi
+                       ;;
+               -P|--use-portage-chost)
+                       CHECK_CHOST="yes"
+                       ;;
+               -c|--get-current-profile)
+                       if [[ ${NEED_ACTION} = "yes" ]] ; then
+                               NEED_ACTION="no"
+                               DOIT="get_current_profile"
+                       fi
+                       ;;
+               -l|--list-profiles)
+                       if [[ ${NEED_ACTION} = "yes" ]] ; then
+                               NEED_ACTION="no"
+                               DOIT="list_profiles"
+                       fi
+                       ;;
+               -E|--print-environ)
+                       if [[ ${NEED_ACTION} = "yes" ]] ; then
+                               NEED_ACTION="no"
+                               DOIT="print_environ"
+                       fi
+                       ;;
+               -B|--get-bin-path)
+                       if [[ ${NEED_ACTION} = "yes" ]] ; then
+                               NEED_ACTION="no"
+                               DOIT="get_bin_path"
+                       fi
+                       ;;
+               -L|--get-lib-path)
+                       if [[ ${NEED_ACTION} = "yes" ]] ; then
+                               NEED_ACTION="no"
+                               DOIT="get_lib_path"
+                       fi
+                       ;;
+               -X|--get-stdcxx-incdir)
+                       if [[ ${NEED_ACTION} = "yes" ]] ; then
+                               NEED_ACTION="no"
+                               DOIT="get_stdcxx_incdir"
+                       fi
+                       ;;
+               -h|--help)
+                       usage 0
+                       exit 0
+                       ;;
+               -v|--version)
+                       echo "gcc-config-PORTAGE-VERSION"
+                       exit 0
+                       ;;
+               -*)
+                       eerror "$0: Invalid switch!  Run $0 without parameters for help."
+                       exit 1
+                       ;;
+               *)
+                       if [[ -z ${CC_COMP} ]] ; then
+                               if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
+                                       # User gave us a # representing the profile
+                                       i=1
+                                       for y in "${GCC_ENV_D}"/* ; do
+                                               [[ ${y/\/config} != ${y} ]] && continue
+
+                                               if [[ -f ${y} ]] && [[ ${x} = ${i} ]] ; then
+                                                       CC_COMP="${y##*/}"
+                                                       break
+                                               fi
+                                               i=$((i + 1))
+                                       done
+                               else
+                                       # User gave us a full HOST-gccver
+                                       x=${x##*/}
+                                       if [[ ! -f ${GCC_ENV_D}/${x} ]] ; then
+                                               eerror "$0: Could not locate '$x' in '${GCC_ENV_D}/'!"
+                                               exit 1
+                                       fi
+                                       CC_COMP="${x}"
+                               fi
+                       else
+                               eerror "$0: Too many arguments!  Run $0 without parameters for help."
+                               exit 1
+                       fi
+                       ;;
+       esac
+done
+
+if [[ ${DOIT} = "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then
+       usage 1
+fi
+
+if [[ -z ${CC_COMP} ]] ; then
+       if get_current_profile &>/dev/null
+       then
+               CC_COMP="$(get_current_profile)"
+       else
+               list_profiles
+               exit 1
+       fi
+fi
+
+CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
+
+GCC_LIB=$(source "${GCC_ENV_D}/${CC_COMP}" 
+       cmd_setup
+       echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }')
+
+if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-} ]] || \
+   [[ ! -f ${GCC_ENV_D}/${CC_COMP} ]]
+then
+       eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
+       #exit 1
+fi
+
+if [[ ${CHECK_CHOST} = "yes" ]] ; then
+       # Chosen CHOST are not the same as the real CHOST according to
+       # make.conf, and --use-portage-chost option was given, so do nothing
+       get_real_chost
+       [[ ${CC_COMP%-*} != ${REAL_CHOST} ]] && exit 0
+fi
+
+eval ${DOIT}
+
+
+# vim:ts=4
diff --git a/sys-devel/gcc-config/files/wrapper-1.4.3.c b/sys-devel/gcc-config/files/wrapper-1.4.3.c
new file mode 100644 (file)
index 0000000..c5e9638
--- /dev/null
@@ -0,0 +1,301 @@
+/*
+ * Copyright 1999-2004 Gentoo Foundation
+ * Distributed under the terms of the GNU General Public License v2
+ * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.3.c,v 1.4 2004/12/29 01:05:58 vapier Exp $
+ * Author: Martin Schlemmer <azarah@gentoo.org>
+ */
+
+#define _REENTRANT
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
+#include <unistd.h>
+#include <wait.h>
+#include <libgen.h>
+#include <string.h>
+#include <stdarg.h>
+#include <errno.h>
+
+#define GCC_CONFIG     "/usr/bin/gcc-config"
+#define ENVD_BASE      "/etc/env.d/05gcc"
+
+struct wrapper_data {
+       char name[MAXPATHLEN + 1];
+       char fullname[MAXPATHLEN + 1];
+       char bin[MAXPATHLEN + 1];
+       char tmp[MAXPATHLEN + 1];
+       
+       char *path;
+};
+
+static const char *wrapper_strerror(int err, struct wrapper_data *data)
+{
+       /* this app doesn't use threads and strerror
+        * is more portable than strerror_r */
+       strncpy(data->tmp, strerror(err), sizeof(data->tmp));
+       return data->tmp;
+}
+
+static void wrapper_exit(char *msg, ...)
+{
+       va_list args;
+       fprintf(stderr, "gcc-config error: ");
+       va_start(args, msg);
+       vfprintf(stderr, msg, args);
+       va_end(args);
+       exit(1);
+}
+
+/* check_for_target checks in path for the file we are seeking
+ * it returns 1 if found (with data->bin setup), 0 if not and
+ * negative on error
+ */
+static int check_for_target(char *path, struct wrapper_data *data)
+{
+       struct stat sbuf;
+       int result = 0;
+       char str[MAXPATHLEN + 1];
+       size_t len = strlen(path) + strlen(data->name) + 2;
+
+       snprintf(str, len, "%s/%s", path, data->name);
+
+       /* Stat possible file to check that
+        * 1) it exist and is a regular file, and
+        * 2) it is not the wrapper itself, and
+        * 3) it is in a /gcc-bin/ directory tree
+        */
+       result = stat(str, &sbuf);
+       if ((result == 0) && \
+           ((sbuf.st_mode & S_IFREG) || (sbuf.st_mode & S_IFLNK)) && \
+           (strcmp(str, data->fullname) != 0) && \
+           (strstr(str, "/gcc-bin/") != 0)) {
+
+               strncpy(data->bin, str, MAXPATHLEN);
+               data->bin[MAXPATHLEN] = 0;
+               result = 1;
+       } else
+               result = 0;
+
+       return result;
+}
+
+static int find_target_in_path(struct wrapper_data *data)
+{
+       char *token = NULL, *state;
+       char str[MAXPATHLEN + 1];
+
+       if (data->path == NULL) return 0;
+
+       /* Make a copy since strtok_r will modify path */
+       snprintf(str, MAXPATHLEN + 1, "%s", data->path);
+
+       token = strtok_r(str, ":", &state);
+
+       /* Find the first file with suitable name in PATH.  The idea here is
+        * that we do not want to bind ourselfs to something static like the
+        * default profile, or some odd environment variable, but want to be
+        * able to build something with a non default gcc by just tweaking
+        * the PATH ... */
+       while ((token != NULL) && strlen(token)) {
+               if (check_for_target(token, data))
+                       return 1;
+               token = strtok_r(NULL, ":", &state);
+       }
+
+       return 0;
+}
+
+/* find_target_in_envd parses /etc/env.d/05gcc, and tries to
+ * extract PATH, which is set to the current profile's bin
+ * directory ...
+ */
+static int find_target_in_envd(struct wrapper_data *data, int cross_compile)
+{
+       FILE *envfile = NULL;
+       char *token = NULL, *state;
+       char str[MAXPATHLEN + 1];
+       char *strp = str;
+       char envd_file[MAXPATHLEN + 1];
+
+       if (!cross_compile) {
+               snprintf(envd_file, MAXPATHLEN, "%s", ENVD_BASE);
+       } else {
+               char *ctarget, *end = strrchr(data->name, '-');
+               if (end == NULL)
+                       return 0;
+               ctarget = strdup(data->name);
+               ctarget[end - data->name] = '\0';
+               snprintf(envd_file, MAXPATHLEN, "%s-%s", ENVD_BASE, ctarget);
+               free(ctarget);
+       }
+       envfile = fopen(envd_file, "r");
+       if (envfile == NULL)
+               return 0;
+
+       while (0 != fgets(strp, MAXPATHLEN, envfile)) {
+               /* Keep reading ENVD_FILE until we get a line that
+                * starts with 'PATH='
+                */
+               if (((strp) && (strlen(strp) > strlen("PATH=")) &&
+                   !strncmp("PATH=", strp, strlen("PATH=")))) {
+
+                       token = strtok_r(strp, "=", &state);
+                       if ((token != NULL) && strlen(token))
+                               /* The second token should be the value of PATH .. */
+                               token = strtok_r(NULL, "=", &state);
+                       else
+                               goto bail;
+
+                       if ((token != NULL) && strlen(token)) {
+                               strp = token;
+                               /* A bash variable may be unquoted, quoted with " or
+                                * quoted with ', so extract the value without those ..
+                                */
+                               token = strtok(strp, "\n\"\'");
+
+                               while (token != NULL) {
+                                       if (check_for_target(token, data)) {
+                                               fclose(envfile);
+                                               return 1;
+                                       }
+
+                                       token = strtok(NULL, "\n\"\'");
+                               }
+                       }
+               }
+               strp = str;
+       }
+
+bail:
+       fclose(envfile);
+       return (cross_compile ? 0 : find_target_in_envd(data, 1));
+}
+
+static void find_wrapper_target(struct wrapper_data *data)
+{
+       FILE *inpipe = NULL;
+       char str[MAXPATHLEN + 1];
+
+       if (find_target_in_path(data))
+               return;
+
+       if (find_target_in_envd(data, 0))
+               return;
+
+       /* Only our wrapper is in PATH, so
+          get the CC path using gcc-config and
+          execute the real binary in there... */
+       inpipe = popen(GCC_CONFIG " --get-bin-path", "r");
+       if (inpipe == NULL)
+               wrapper_exit(
+                       "Could not open pipe: %s\n",
+                       wrapper_strerror(errno, data));
+
+       if (fgets(str, MAXPATHLEN, inpipe) == 0)
+               wrapper_exit(
+                       "Could not get compiler binary path: %s\n",
+                       wrapper_strerror(errno, data));
+
+       strncpy(data->bin, str, sizeof(data->bin) - 1);
+       data->bin[strlen(data->bin) - 1] = '/';
+       strncat(data->bin, data->name, sizeof(data->bin) - 1);
+       data->bin[MAXPATHLEN] = 0;
+
+       pclose(inpipe);
+}
+
+/* This function modifies PATH to have gcc's bin path appended */
+static void modify_path(struct wrapper_data *data)
+{
+       char *newpath = NULL, *token = NULL, *state;
+       char dname_data[MAXPATHLEN + 1], str[MAXPATHLEN + 1];
+       char *str2 = dname_data, *dname = dname_data;
+       size_t len = 0;
+
+       if (data->bin == NULL)
+               return;
+
+       snprintf(str2, MAXPATHLEN + 1, "%s", data->bin);
+
+       if ((dname = dirname(str2)) == NULL)
+               return;
+
+       if (data->path == NULL)
+               return;
+
+       /* Make a copy since strtok_r will modify path */
+       snprintf(str, MAXPATHLEN + 1, "%s", data->path);
+
+       token = strtok_r(str, ":", &state);
+
+       /* Check if we already appended our bin location to PATH */
+       if ((token != NULL) && strlen(token)) {
+               if (!strcmp(token, dname))
+                       return;
+       }
+
+       len = strlen(dname) + strlen(data->path) + 2 + strlen("PATH") + 1;
+
+       newpath = (char *)malloc(len);
+       if (newpath == NULL)
+               wrapper_exit("out of memory\n");
+       memset(newpath, 0, len);
+
+       snprintf(newpath, len, "PATH=%s:%s", dname, data->path);
+       putenv(newpath);
+}
+
+int main(int argc, char *argv[])
+{
+       struct wrapper_data *data;
+       size_t size;
+       char *path;
+       int result = 0;
+
+       data = alloca(sizeof(*data));
+       if (data == NULL)
+               wrapper_exit("%s wrapper: out of memory\n", argv[0]);
+       memset(data, 0, sizeof(*data));
+
+       path = getenv("PATH");
+       if (path != NULL) {
+               data->path = strdup(getenv("PATH"));
+               if (data->path == NULL)
+                       wrapper_exit("%s wrapper: out of memory\n", argv[0]);
+       }
+
+       /* What should we find ? */
+       strcpy(data->name, basename(argv[0]));
+
+       /* cc calls "/full/path/to/gcc" ... */
+       if (!strcmp(data->name, "cc"))
+               strcpy(data->name, "gcc");
+
+       /* What is the full name of our wrapper? */
+       size = sizeof(data->fullname);
+       result = snprintf(data->fullname, size, "/usr/bin/%s", data->name);
+       if ((result == -1) || (result > size))
+               wrapper_exit("invalid wrapper name: \"%s\"\n", data->name);
+
+       find_wrapper_target(data);
+
+       modify_path(data);
+
+       if (data->path)
+               free(data->path);
+       data->path = NULL;
+
+       /* Set argv[0] to the correct binary, else gcc can't find internal headers
+        * http://bugs.gentoo.org/show_bug.cgi?id=8132 */
+       argv[0] = data->bin;
+
+       /* Ok, do it ... */
+       if (execv(data->bin, argv) < 0)
+               wrapper_exit("Could not run/locate \"%s\"\n", data->name);
+
+       return 0;
+}
diff --git a/sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild
new file mode 100644 (file)
index 0000000..8472ac2
--- /dev/null
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild,v 1.1 2004/12/29 01:05:58 vapier Exp $
+
+inherit toolchain-funcs
+
+# Version of .c wrapper to use
+W_VER="1.4.3"
+
+DESCRIPTION="Utility to change the gcc compiler being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+       >=sys-apps/portage-2.0.47-r10" # We need portageq ...
+
+S=${WORKDIR}
+
+src_compile() {
+       $(tc-getCC) -O2 -Wall -o wrapper \
+               ${FILESDIR}/wrapper-${W_VER}.c || die "compile wrapper"
+}
+
+src_install() {
+       newbin ${FILESDIR}/${PN}-${PV} ${PN} || die "install gcc-config"
+       dosed "s:PORTAGE-VERSION:${PVR}:" /usr/bin/${PN}
+
+       exeinto /usr/lib/gcc-config
+       doexe wrapper || die "install wrapper"
+}
+
+pkg_postinst() {
+       # Do we have a valid multi ver setup ?
+       if gcc-config --get-current-profile &>/dev/null ; then
+               # We not longer use the /usr/include/g++-v3 hacks, as
+               # it is not needed ...
+               [[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++
+               [[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3
+               [[ ${ROOT} = "/" ]] && gcc-config $(/usr/bin/gcc-config --get-current-profile)
+       fi
+}
similarity index 94%
rename from sys-devel/gcc-config/gcc-config-1.3.8-r2.ebuild
rename to sys-devel/gcc-config/gcc-config-1.3.9.ebuild
index b20970f330c44a976a81b0b812f951074b06fc00..baf5f568912af0f58c3d3508e94e473cbba6d752 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.8-r2.ebuild,v 1.1 2004/12/28 05:32:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.9.ebuild,v 1.1 2004/12/29 01:05:58 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -14,6 +14,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="-*"
 IUSE=""
 
 DEPEND="virtual/libc