diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch | 428 |
1 files changed, 0 insertions, 428 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch deleted file mode 100644 index aad234c69e..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.7/fix-g++-sysroot.patch +++ /dev/null @@ -1,428 +0,0 @@ -backport - -http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gcc-4.7.2/gcc/configure.ac -=================================================================== ---- gcc-4.7.2.orig/gcc/configure.ac 2012-09-20 07:42:30.284941174 -0700 -+++ gcc-4.7.2/gcc/configure.ac 2012-09-20 07:55:23.148970564 -0700 -@@ -118,6 +118,72 @@ - local_prefix=/usr/local - fi - -+AC_ARG_WITH([native-system-header-dir], -+ [ --with-native-system-header-dir=dir -+ use dir as the directory to look for standard -+ system header files in. Defaults to /usr/include.], -+[ -+ case ${with_native_system_header_dir} in -+ yes|no) AC_MSG_ERROR([bad value ${withval} given for --with-native-system-header-dir]) ;; -+ /* | [[A-Za-z]]:[[\\/]]*) ;; -+ *) AC_MSG_ERROR([--with-native-system-header-dir argument ${withval} must be an absolute directory]) ;; -+ esac -+ configured_native_system_header_dir="${withval}" -+], [configured_native_system_header_dir=]) -+ -+AC_ARG_WITH(build-sysroot, -+ [AS_HELP_STRING([--with-build-sysroot=sysroot], -+ [use sysroot as the system root during the build])], -+ [if test x"$withval" != x ; then -+ SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" -+ fi], -+ [SYSROOT_CFLAGS_FOR_TARGET=]) -+AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) -+ -+AC_ARG_WITH(sysroot, -+[AS_HELP_STRING([[--with-sysroot[=DIR]]], -+ [search for usr/lib, usr/include, et al, within DIR])], -+[ -+ case ${with_sysroot} in -+ /) ;; -+ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;; -+ esac -+ case ${with_sysroot} in -+ yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; -+ *) TARGET_SYSTEM_ROOT=$with_sysroot ;; -+ esac -+ -+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' -+ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' -+ -+ if test "x$prefix" = xNONE; then -+ test_prefix=/usr/local -+ else -+ test_prefix=$prefix -+ fi -+ if test "x$exec_prefix" = xNONE; then -+ test_exec_prefix=$test_prefix -+ else -+ test_exec_prefix=$exec_prefix -+ fi -+ case ${TARGET_SYSTEM_ROOT} in -+ "${test_prefix}"|"${test_prefix}/"*|\ -+ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ -+ '${prefix}'|'${prefix}/'*|\ -+ '${exec_prefix}'|'${exec_prefix}/'*) -+ t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" -+ TARGET_SYSTEM_ROOT_DEFINE="$t" -+ ;; -+ esac -+], [ -+ TARGET_SYSTEM_ROOT= -+ TARGET_SYSTEM_ROOT_DEFINE= -+ CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' -+]) -+AC_SUBST(TARGET_SYSTEM_ROOT) -+AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) -+AC_SUBST(CROSS_SYSTEM_HEADER_DIR) -+ - # Don't set gcc_gxx_include_dir to gxx_include_dir since that's only - # passed in by the toplevel make and thus we'd get different behavior - # depending on where we built the sources. -@@ -149,7 +215,9 @@ - if test "${with_sysroot+set}" = set; then - gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` - if test "${gcc_gxx_without_sysroot}"; then -- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" -+ if test x${with_sysroot} != x/; then -+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" -+ fi - gcc_gxx_include_dir_add_sysroot=1 - fi - fi -@@ -733,68 +801,6 @@ - ], [enable_shared=yes]) - AC_SUBST(enable_shared) - --AC_ARG_WITH([native-system-header-dir], -- [ --with-native-system-header-dir=dir -- use dir as the directory to look for standard -- system header files in. Defaults to /usr/include.], --[ -- case ${with_native_system_header_dir} in -- yes|no) AC_MSG_ERROR([bad value ${withval} given for --with-native-system-header-dir]) ;; -- /* | [[A-Za-z]]:[[\\/]]*) ;; -- *) AC_MSG_ERROR([--with-native-system-header-dir argument ${withval} must be an absolute directory]) ;; -- esac -- configured_native_system_header_dir="${withval}" --], [configured_native_system_header_dir=]) -- --AC_ARG_WITH(build-sysroot, -- [AS_HELP_STRING([--with-build-sysroot=sysroot], -- [use sysroot as the system root during the build])], -- [if test x"$withval" != x ; then -- SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" -- fi], -- [SYSROOT_CFLAGS_FOR_TARGET=]) --AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) -- --AC_ARG_WITH(sysroot, --[AS_HELP_STRING([[--with-sysroot[=DIR]]], -- [search for usr/lib, usr/include, et al, within DIR])], --[ -- case ${with_sysroot} in -- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; -- *) TARGET_SYSTEM_ROOT=$with_sysroot ;; -- esac -- -- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' -- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' -- -- if test "x$prefix" = xNONE; then -- test_prefix=/usr/local -- else -- test_prefix=$prefix -- fi -- if test "x$exec_prefix" = xNONE; then -- test_exec_prefix=$test_prefix -- else -- test_exec_prefix=$exec_prefix -- fi -- case ${TARGET_SYSTEM_ROOT} in -- "${test_prefix}"|"${test_prefix}/"*|\ -- "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ -- '${prefix}'|'${prefix}/'*|\ -- '${exec_prefix}'|'${exec_prefix}/'*) -- t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" -- TARGET_SYSTEM_ROOT_DEFINE="$t" -- ;; -- esac --], [ -- TARGET_SYSTEM_ROOT= -- TARGET_SYSTEM_ROOT_DEFINE= -- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' --]) --AC_SUBST(TARGET_SYSTEM_ROOT) --AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) --AC_SUBST(CROSS_SYSTEM_HEADER_DIR) -- - AC_ARG_WITH(specs, - [AS_HELP_STRING([--with-specs=SPECS], - [add SPECS to driver command-line processing])], -Index: gcc-4.7.2/gcc/configure -=================================================================== ---- gcc-4.7.2.orig/gcc/configure 2012-09-20 07:42:30.284941174 -0700 -+++ gcc-4.7.2/gcc/configure 2012-09-20 07:55:31.788970893 -0700 -@@ -757,10 +757,6 @@ - REPORT_BUGS_TO - PKGVERSION - CONFIGURE_SPECS --CROSS_SYSTEM_HEADER_DIR --TARGET_SYSTEM_ROOT_DEFINE --TARGET_SYSTEM_ROOT --SYSROOT_CFLAGS_FOR_TARGET - enable_shared - enable_fixed_point - enable_decimal_float -@@ -798,6 +794,10 @@ - CFLAGS - CC - GENINSRC -+CROSS_SYSTEM_HEADER_DIR -+TARGET_SYSTEM_ROOT_DEFINE -+TARGET_SYSTEM_ROOT -+SYSROOT_CFLAGS_FOR_TARGET - target_subdir - host_subdir - build_subdir -@@ -859,6 +859,9 @@ - enable_option_checking - with_build_libsubdir - with_local_prefix -+with_native_system_header_dir -+with_build_sysroot -+with_sysroot - with_gxx_include_dir - with_cpp_install_dir - enable_generated_files_in_srcdir -@@ -883,9 +886,6 @@ - enable_objc_gc - with_dwarf2 - enable_shared --with_native_system_header_dir --with_build_sysroot --with_sysroot - with_specs - with_pkgversion - with_bugurl -@@ -1639,6 +1639,12 @@ - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-build-libsubdir=DIR Directory where to find libraries for build system - --with-local-prefix=DIR specifies directory to put local include -+ --with-native-system-header-dir=dir -+ use dir as the directory to look for standard -+ system header files in. Defaults to /usr/include. -+ --with-build-sysroot=sysroot -+ use sysroot as the system root during the build -+ --with-sysroot[=DIR] search for usr/lib, usr/include, et al, within DIR - --with-gxx-include-dir=DIR - specifies directory to put g++ header files - --with-cpp-install-dir=DIR -@@ -1651,12 +1657,6 @@ - --with-as arrange to use the specified as (full pathname) - --with-stabs arrange to use stabs instead of host debug format - --with-dwarf2 force the default debug format to be DWARF 2 -- --with-native-system-header-dir=dir -- use dir as the directory to look for standard -- system header files in. Defaults to /usr/include. -- --with-build-sysroot=sysroot -- use sysroot as the system root during the build -- --with-sysroot[=DIR] search for usr/lib, usr/include, et al, within DIR - --with-specs=SPECS add SPECS to driver command-line processing - --with-pkgversion=PKG Use PKG in the version string in place of "GCC" - --with-bugurl=URL Direct users to URL to report a bug -@@ -3288,6 +3288,82 @@ - local_prefix=/usr/local - fi - -+ -+# Check whether --with-native-system-header-dir was given. -+if test "${with_native_system_header_dir+set}" = set; then : -+ withval=$with_native_system_header_dir; -+ case ${with_native_system_header_dir} in -+ yes|no) as_fn_error "bad value ${withval} given for --with-native-system-header-dir" "$LINENO" 5 ;; -+ /* | [A-Za-z]:[\\/]*) ;; -+ *) as_fn_error "--with-native-system-header-dir argument ${withval} must be an absolute directory" "$LINENO" 5 ;; -+ esac -+ configured_native_system_header_dir="${withval}" -+ -+else -+ configured_native_system_header_dir= -+fi -+ -+ -+ -+# Check whether --with-build-sysroot was given. -+if test "${with_build_sysroot+set}" = set; then : -+ withval=$with_build_sysroot; if test x"$withval" != x ; then -+ SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" -+ fi -+else -+ SYSROOT_CFLAGS_FOR_TARGET= -+fi -+ -+ -+ -+ -+# Check whether --with-sysroot was given. -+if test "${with_sysroot+set}" = set; then : -+ withval=$with_sysroot; -+ case ${with_sysroot} in -+ /) ;; -+ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;; -+ esac -+ case ${with_sysroot} in -+ yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; -+ *) TARGET_SYSTEM_ROOT=$with_sysroot ;; -+ esac -+ -+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' -+ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' -+ -+ if test "x$prefix" = xNONE; then -+ test_prefix=/usr/local -+ else -+ test_prefix=$prefix -+ fi -+ if test "x$exec_prefix" = xNONE; then -+ test_exec_prefix=$test_prefix -+ else -+ test_exec_prefix=$exec_prefix -+ fi -+ case ${TARGET_SYSTEM_ROOT} in -+ "${test_prefix}"|"${test_prefix}/"*|\ -+ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ -+ '${prefix}'|'${prefix}/'*|\ -+ '${exec_prefix}'|'${exec_prefix}/'*) -+ t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" -+ TARGET_SYSTEM_ROOT_DEFINE="$t" -+ ;; -+ esac -+ -+else -+ -+ TARGET_SYSTEM_ROOT= -+ TARGET_SYSTEM_ROOT_DEFINE= -+ CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' -+ -+fi -+ -+ -+ -+ -+ - # Don't set gcc_gxx_include_dir to gxx_include_dir since that's only - # passed in by the toplevel make and thus we'd get different behavior - # depending on where we built the sources. -@@ -3321,7 +3397,9 @@ - if test "${with_sysroot+set}" = set; then - gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` - if test "${gcc_gxx_without_sysroot}"; then -- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" -+ if test x${with_sysroot} != x/; then -+ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" -+ fi - gcc_gxx_include_dir_add_sysroot=1 - fi - fi -@@ -7220,78 +7298,6 @@ - - - --# Check whether --with-native-system-header-dir was given. --if test "${with_native_system_header_dir+set}" = set; then : -- withval=$with_native_system_header_dir; -- case ${with_native_system_header_dir} in -- yes|no) as_fn_error "bad value ${withval} given for --with-native-system-header-dir" "$LINENO" 5 ;; -- /* | [A-Za-z]:[\\/]*) ;; -- *) as_fn_error "--with-native-system-header-dir argument ${withval} must be an absolute directory" "$LINENO" 5 ;; -- esac -- configured_native_system_header_dir="${withval}" -- --else -- configured_native_system_header_dir= --fi -- -- -- --# Check whether --with-build-sysroot was given. --if test "${with_build_sysroot+set}" = set; then : -- withval=$with_build_sysroot; if test x"$withval" != x ; then -- SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" -- fi --else -- SYSROOT_CFLAGS_FOR_TARGET= --fi -- -- -- -- --# Check whether --with-sysroot was given. --if test "${with_sysroot+set}" = set; then : -- withval=$with_sysroot; -- case ${with_sysroot} in -- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; -- *) TARGET_SYSTEM_ROOT=$with_sysroot ;; -- esac -- -- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' -- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' -- -- if test "x$prefix" = xNONE; then -- test_prefix=/usr/local -- else -- test_prefix=$prefix -- fi -- if test "x$exec_prefix" = xNONE; then -- test_exec_prefix=$test_prefix -- else -- test_exec_prefix=$exec_prefix -- fi -- case ${TARGET_SYSTEM_ROOT} in -- "${test_prefix}"|"${test_prefix}/"*|\ -- "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ -- '${prefix}'|'${prefix}/'*|\ -- '${exec_prefix}'|'${exec_prefix}/'*) -- t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" -- TARGET_SYSTEM_ROOT_DEFINE="$t" -- ;; -- esac -- --else -- -- TARGET_SYSTEM_ROOT= -- TARGET_SYSTEM_ROOT_DEFINE= -- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' -- --fi -- -- -- -- -- -- - # Check whether --with-specs was given. - if test "${with_specs+set}" = set; then : - withval=$with_specs; CONFIGURE_SPECS=$withval -@@ -18013,7 +18019,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 18016 "configure" -+#line 18022 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -18119,7 +18125,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 18122 "configure" -+#line 18128 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H |