diff options
-rw-r--r-- | sys-devel/gcc-config/ChangeLog | 10 | ||||
-rw-r--r-- | sys-devel/gcc-config/files/digest-gcc-config-1.3.8 | 0 | ||||
-rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.8 | 478 | ||||
-rw-r--r-- | sys-devel/gcc-config/files/wrapper-1.4.3.c | 206 | ||||
-rw-r--r-- | sys-devel/gcc-config/gcc-config-1.3.8.ebuild | 47 |
5 files changed, 610 insertions, 131 deletions
diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index c50cd3ff4231..05a14b0c4c9e 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-devel/gcc-config # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.69 2004/12/08 23:47:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.70 2004/12/23 18:04:06 vapier Exp $ + +*gcc-config-1.3.8 (23 Dec 2004) + + 23 Dec 2004; Mike Frysinger <vapier@gentoo.org>: + Make sure GCC_SPECS doesn't hang around when switching between profiles. + Copy libgcc_s.so to /lib (since some systems link files in /bin against it). + Make sure the wrapper can locate cross-compilers via /etc/env.d files when + the active environment is empty. *gcc-config-1.3.7-r6 (08 Dec 2004) diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.8 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.8 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.8 diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.8 b/sys-devel/gcc-config/files/gcc-config-1.3.8 new file mode 100755 index 000000000000..309f49694423 --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-1.3.8 @@ -0,0 +1,478 @@ +#!/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.1 2004/12/23 18:04:06 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 + echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc" + 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 + echo "#!/bin/sh"$'\n'"exec ${x} -m${bits} \"\$@\"" \ + > "${ROOT}/usr/bin/${x}${bits}" + chmod 755 "${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 index 30067a9d4c48..80e1a81d2623 100644 --- a/sys-devel/gcc-config/files/wrapper-1.4.3.c +++ b/sys-devel/gcc-config/files/wrapper-1.4.3.c @@ -1,13 +1,10 @@ /* * 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.1 2004/10/26 18:15:30 azarah Exp $ + * $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/wrapper-1.4.3.c,v 1.2 2004/12/23 18:04:06 vapier Exp $ * Author: Martin Schlemmer <azarah@gentoo.org> */ -/* Define if need of debugging */ -#undef WRAPPER_DEBUG - #define _REENTRANT #define _GNU_SOURCE @@ -23,16 +20,8 @@ #include <stdarg.h> #include <errno.h> -#define GCC_CONFIG "/usr/bin/gcc-config" - -#ifndef CC_PROFILE -# define ENVD_FILE "/etc/env.d/05gcc" -#else -# define ENVD_FILE "/etc/env.d/gcc/" CC_PROFILE -#endif - -#define CODESIZE_STR_LEN (sizeof(char) * (3 + strlen(gccbits))) -#define TMP_STR_LEN (sizeof(char) * 32 * 1024) +#define GCC_CONFIG "/usr/bin/gcc-config" +#define ENVD_BASE "/etc/env.d/05gcc" struct wrapper_data { char name[MAXPATHLEN + 1]; @@ -45,12 +34,14 @@ struct wrapper_data { static const char *wrapper_strerror(int err, struct wrapper_data *data) { - strerror_r(err, data->tmp, sizeof(data->tmp)); + /* 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); @@ -59,11 +50,11 @@ static void wrapper_exit(char *msg, ...) exit(1); } -/* check_for_target checks in path for the file we are seeking +/* 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) +static int check_for_target(char *path, struct wrapper_data *data) { struct stat sbuf; int result = 0; @@ -78,16 +69,15 @@ static int check_for_target(char *path, struct wrapper_data *data) * 3) it is in a /gcc-bin/ directory tree */ result = stat(str, &sbuf); - if ((0 == result) && - ((sbuf.st_mode & S_IFREG) || (sbuf.st_mode & S_IFLNK)) && - (0 != strcmp(str, data->fullname)) && - (0 != strstr(str, "/gcc-bin/"))) { - + 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 + } else result = 0; return result; @@ -97,12 +87,12 @@ static int find_target_in_path(struct wrapper_data *data) { char *token = NULL, *state; char str[MAXPATHLEN + 1]; - - if (NULL == data->path) return 0; + + 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 @@ -110,14 +100,12 @@ static int find_target_in_path(struct wrapper_data *data) * 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 ((NULL != token) && (strlen(token) > 0)) { - + while ((token != NULL) && strlen(token)) { if (check_for_target(token, data)) return 1; - token = strtok_r(NULL, ":", &state); } - + return 0; } @@ -125,92 +113,89 @@ static int find_target_in_path(struct wrapper_data *data) * extract PATH, which is set to the current profile's bin * directory ... */ -static int find_target_in_envd(struct wrapper_data *data) +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 (NULL == data->path) return 0; - - envfile = fopen(ENVD_FILE, "r"); - if (NULL == envfile) + 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=")) && - 0 == strncmp("PATH=", strp, strlen("PATH=")))) { - + !strncmp("PATH=", strp, strlen("PATH=")))) { + token = strtok_r(strp, "=", &state); - if ((NULL != token) && (strlen(token) > 0)) + if ((token != NULL) && strlen(token)) /* The second token should be the value of PATH .. */ token = strtok_r(NULL, "=", &state); - else { - fclose(envfile); - return 0; - } - - if ((NULL != token) && (strlen(token) > 0)) { - + 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 = strsep(&strp, "\n\"\'"); + token = strtok(strp, "\n\"\'"); - while (NULL != token) { - + while (token != NULL) { if (check_for_target(token, data)) { - fclose(envfile); return 1; } - token = strsep(&strp, "\n\"\'"); + token = strtok(NULL, "\n\"\'"); } } - } strp = str; } +bail: fclose(envfile); - - return 0; + return (cross_compile ? 0 : find_target_in_envd(data, 1)); } -static void find_wrapper_target(struct wrapper_data *data) +static void find_wrapper_target(struct wrapper_data *data) { FILE *inpipe = NULL; char str[MAXPATHLEN + 1]; -#ifndef CC_PROFILE if (find_target_in_path(data)) return; -#endif - if (find_target_in_envd(data)) + if (find_target_in_envd(data, 0)) return; - /* Only our wrapper is in PATH, so - get the CC path using gcc-config and + /* Only our wrapper is in PATH, so + get the CC path using gcc-config and execute the real binary in there... */ -#ifndef CC_PROFILE inpipe = popen(GCC_CONFIG " --get-bin-path", "r"); -#else - inpipe = popen(GCC_CONFIG " --get-bin-path " CC_PROFILE, "r"); -#endif - if (NULL == inpipe) + if (inpipe == NULL) wrapper_exit( "Could not open pipe: %s\n", wrapper_strerror(errno, data)); - if (0 == fgets(str, MAXPATHLEN, inpipe)) + if (fgets(str, MAXPATHLEN, inpipe) == 0) wrapper_exit( "Could not get compiler binary path: %s\n", wrapper_strerror(errno, data)); @@ -231,15 +216,15 @@ static void modify_path(struct wrapper_data *data) char *str2 = dname_data, *dname = dname_data; size_t len = 0; - if (NULL == data->bin) + if (data->bin == NULL) return; snprintf(str2, MAXPATHLEN + 1, "%s", data->bin); - if (NULL == (dname = dirname(str2))) + if ((dname = dirname(str2)) == NULL) return; - if (NULL == data->path) + if (data->path == NULL) return; /* Make a copy since strtok_r will modify path */ @@ -248,60 +233,52 @@ static void modify_path(struct wrapper_data *data) token = strtok_r(str, ":", &state); /* Check if we already appended our bin location to PATH */ - if ((NULL != token) && (strlen(token) > 0)) { - if (0 == strcmp(token, dname)) + if ((token != NULL) && strlen(token)) { + if (!strcmp(token, dname)) return; } - len = strlen(dname) + strlen(data->path) + 2; + len = strlen(dname) + strlen(data->path) + 2 + strlen("PATH") + 1; newpath = (char *)malloc(len); - if (NULL == newpath) + if (newpath == NULL) wrapper_exit("out of memory\n"); memset(newpath, 0, len); - snprintf(newpath, len, "%s:%s", dname, data->path); - setenv("PATH", newpath, 1); - - if (newpath) - free(newpath); - newpath = NULL; + snprintf(newpath, len, "PATH=%s:%s", dname, data->path); + putenv(newpath); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { struct wrapper_data *data; size_t size; - char *myargv[argc + 2]; - char *path, *gccbits, *codesize; -#ifdef WRAPPER_DEBUG - char *tmpstr; -#endif - int result = 0, i; + char *path; + int result = 0; data = alloca(sizeof(*data)); - if (NULL == data) + if (data == NULL) wrapper_exit("%s wrapper: out of memory\n", argv[0]); memset(data, 0, sizeof(*data)); path = getenv("PATH"); - if (NULL != path) { + if (path != NULL) { data->path = strdup(getenv("PATH")); - if (NULL == data->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 (0 == strcmp(data->name, "cc")) + 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 ((-1 == result) || (result > size)) + if ((result == -1) || (result > size)) wrapper_exit("invalid wrapper name: \"%s\"\n", data->name); find_wrapper_target(data); @@ -312,44 +289,13 @@ int main(int argc, char **argv) free(data->path); data->path = NULL; - for (i = 0;i < argc;i++) - myargv[i] = argv[i]; + /* 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; - myargv[argc + 1] = NULL; - - /* Add '-m$GCCBITS' to argv */ - gccbits = getenv("GCCBITS"); - if (NULL != gccbits - /* Make sure we have something remotely valid */ - && strlen(gccbits) >= 2) { - codesize = (char *)alloca(CODESIZE_STR_LEN); - snprintf(codesize, CODESIZE_STR_LEN, "-m%s", gccbits); - myargv[argc] = codesize; - } else { - /* Nothing to add, so just set to NULL */ - myargv[argc] = NULL; - } - - /* Set argv[0] to the correct binary, else gcc do not find internal - * headers, etc (bug #8132). */ - myargv[0] = data->bin; - -#ifndef WRAPPER_DEBUG /* Ok, do it ... */ - if (execv(data->bin, myargv) < 0) + if (execv(data->bin, argv) < 0) wrapper_exit("Could not run/locate \"%s\"\n", data->name); -#else - tmpstr = (char *)alloca(TMP_STR_LEN); - tmpstr = strndup(myargv[0], TMP_STR_LEN); - for (i = 1;i < (argc + 2);i++) { - if (NULL != myargv[i]) { - strncat(tmpstr, " ", TMP_STR_LEN - strlen(tmpstr)); - strncat(tmpstr, myargv[i], TMP_STR_LEN - strlen(tmpstr)); - } - } - printf("%s\n", tmpstr); -#endif - + return 0; } - diff --git a/sys-devel/gcc-config/gcc-config-1.3.8.ebuild b/sys-devel/gcc-config/gcc-config-1.3.8.ebuild new file mode 100644 index 000000000000..28634bde50a2 --- /dev/null +++ b/sys-devel/gcc-config/gcc-config-1.3.8.ebuild @@ -0,0 +1,47 @@ +# 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.ebuild,v 1.1 2004/12/23 18:04:06 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" +KEYWORDS="-*" +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 +} |