AUX wrapper-1.5.1-no-ABI.patch 2893 RMD160 c986d6895d1471f9b873ff9bbf909da9dd6c4291 SHA1 906b2452a1f9e4b4d440af30b305fc1a7a3d7ffa SHA256 5fa469268405c55aa609c8a58751436147d4f153bf5893e5515cd036d21d489c

EBUILD gcc-config-1.4.1-r1.ebuild 1714 RMD160 290de914656f43937ccbc2d3ce4b2674cc588184 SHA1 fa02009bc1c51bb6d76fd04b9fb56dcafc795e3e SHA256 bbb7370ef6a9f96e26cb1897ff1ed108545df670fe8a2d6792e5d8745bb742a3

EBUILD gcc-config-1.5-r1.ebuild 1703 RMD160 6d90c089028d0a48b5cd985f0f64dec7cafd240a SHA1 13eccd26f0eded63909973420ec7f502646fc039 SHA256 40d4b77166f1400f4f7345d4882ba4fbb30e4fd01fc2bc8d1e30302064f920a5

iQIcBAEBCAAGBQJNLLDCAAoJEHQ6UuhrqBBQ9TIP/0qSZNb1+mgLw9s05lStUlvI

sZ1E4uudH9CEqyhBXyAF/Q+gbN3wdWg5gCoUX4+vbgwo6zBScevJUq6wnHhlGpbN

x4U6sUSegDReVhP0kUOlK1vhVv4ecmT9hxJOZQ/D3nro54JrelgX3DjA2TBSL/o/

kbqOdbpAzgAYzFjGI7K+z82ppTuu13C11hrkgL6JHFqF+Kznrt23mzOKMJk1nPlh

J3bng8hI689SNxppR2w1nvd4czYr6n40RWYZo3CKbY+3cDtQshpjjtnY0Un/Akdz

i3tYKYMArjLj9KgUfiHUwgCIjE6N4zGReugvcRD35jPy0rcFf7XOzva0IhGGUmdZ

ybpM4gKBjKqug95DA5lc2VsngBm4aABCoCwTYvBRwZU5OvBNJ5ymgyXMLcYHKSzS

e5sUXA31nvsC6z1B+RVEeQwJ7nuTAxYSuu8yOKFyzcRNkQSlundRZ9KtQh9SzNrW

uNwbD5MS3sfW+AIEDvjhBLHjzvc2uX5BnphaX1cEtGb6x3l5e5W4wFLLiUQctjMw

slvb3NZyreo+8Vp338dOAW8tc5ozjfAhy4lvG1c5fIrOO3/MKduRxt2coTG+31ld

i9jeGe/Hq8j94bUto4WlH6xKrATTSmUD9uWWlcWLOkJH/yvyGA8/p3OJUeDYvNkh

V3l8UxpInVLr0B4ePeut

=AEB4

Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>

Purpose: To stop gcc-config from adding on to gcc's commandline to

	enforce that the environment variable ${CFLAGS_${ABI}} is

	respected by GCC. This causes problems and makes debugging

	compilation failures harder. See

	https://bugs.gentoo.org/351384 .

--- a/wrapper.c	Tue Jan 11 13:27:08 2011 -0500

+++ b/wrapper.c	Tue Jan 11 14:14:39 2011 -0500

@@ -62,7 +62,6 @@

        return ret; \

 }

 xmemwrap(malloc, (size_t size), (size))

-xmemwrap(calloc, (size_t nemb, size_t size), (nemb, size))

 xmemwrap(strdup, (const char *s), (s))

 /* check_for_target checks in path for the file we are seeking

@@ -270,49 +270,6 @@

 	putenv(newpath);

 }

-static char *abi_flags[] = {

-	"-m32", "-m64", "-mabi",

-};

-static char **build_new_argv(char **argv, const char *newflags_str)

-{

-#define MAX_NEWFLAGS 32

-	char *newflags[MAX_NEWFLAGS];

-	char **retargv;

-	unsigned int argc, i;

-	char *state, *flags_tokenized;

-

-	retargv = argv;

-

-	/* make sure user hasn't specified any ABI flags already ...

-	 * if they have, lets just get out of here ... this of course

-	 * is by no means complete, it's merely a hack that works most

-	 * of the time ...

-	 */

-	for (argc = 0; argv[argc]; ++argc)

-		for (i = 0; i < ARRAY_SIZE(abi_flags); ++i)

-			if (!strncmp(argv[argc], abi_flags[i], strlen(abi_flags[i])))

-				return retargv;

-

-	/* Tokenize the flag list and put it into newflags array */

-	flags_tokenized = xstrdup(newflags_str);

-	i = 0;

-	newflags[i] = strtok_r(flags_tokenized, " \t\n", &state);

-	while (newflags[i] != NULL && i < MAX_NEWFLAGS-1)

-		newflags[++i] = strtok_r(NULL, " \t\n", &state);

-

-	/* allocate memory for our spiffy new argv */

-	retargv = xcalloc(argc + i + 1, sizeof(char*));

-	/* start building retargv */

-	retargv[0] = argv[0];

-	/* insert the ABI flags first so cmdline always overrides ABI flags */

-	memcpy(retargv+1, newflags, i * sizeof(char*));

-	/* copy over the old argv */

-	if (argc > 1)

-		memcpy(retargv+1+i, argv+1, (argc-1) * sizeof(char*));

-

-	return retargv;

-}

-

 int main(int argc, char *argv[])

 {

 	struct wrapper_data data;

@@ -347,23 +304,8 @@

 	 */

 	argv[0] = data.bin;

-	/* If $ABI is in env, add appropriate env flags */

-	char **newargv = argv;

-	if (getenv("ABI")) {

-		char envvar[50];

-

-		/* We use CFLAGS_${ABI} for gcc, g++, g77, etc as the flags that would

-		 * be in there are the same no matter which compiler we are using.

-		 */

-		snprintf(envvar, sizeof(envvar), "CFLAGS_%s", getenv("ABI"));

-		envvar[sizeof(envvar)-1] = '\0';

-

-		if (getenv(envvar))

-			newargv = build_new_argv(argv, getenv(envvar));

-	}

-

-	/* Ok, lets do it one more time ... */

-	execv(data.bin, newargv);

+	/* Ok, let's do it one more time ... */

+	execv(data.bin, argv);

 	/* shouldn't have made it here if things worked ... */

 	wrapper_err("could not run/locate '%s'", data.name);

# Copyright 1999-2011 Gentoo Foundation

inherit eutils flag-o-matic toolchain-funcs multilib

KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"

	epatch "${FILESDIR}"/wrapper-${W_VER}-no-ABI.patch

# Copyright 1999-2011 Gentoo Foundation

inherit eutils flag-o-matic toolchain-funcs multilib

	epatch "${FILESDIR}"/wrapper-${W_VER}-no-ABI.patch