Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27753
Modified Files: llvm-gcc42.patch Log Message: backport openembedded fix for sysroot finding gxx headers and misc fixes Index: llvm-gcc42.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/llvm-gcc42.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- llvm-gcc42.patch 8 Jul 2013 00:06:29 -0000 1.1 +++ llvm-gcc42.patch 8 Jul 2013 15:33:59 -0000 1.2 @@ -82,7 +82,7 @@ +#!/bin/sh +# APPLE LOCAL file B&I + -+set +x ++set -x + +# -arch arguments are different than configure arguments. We need to +# translate them. @@ -194,9 +194,9 @@ +# DO NOT USE $DEST_ROOT to check LIBSTDCXX_VERSION here. Directly use /usr here. +# $DEST_ROOT is /Developer for llvm-gcc +if [ ! -d "/usr/include/c++/$LIBSTDCXX_VERSION" ]; then -+ LIBSTDCXX_VERSION=4.0.0 ++ LIBSTDCXX_VERSION=4.2.1 +fi -+NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=/usr/include/c++/$LIBSTDCXX_VERSION" ++NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=@@SDKROOT@@/usr/include/c++/$LIBSTDCXX_VERSION" +# LLVM LOCAL end + +# Build against the MacOSX10.5 SDK for PowerPC. @@ -994,3 +994,159 @@ # The fully-named drivers, which have the same target on every host. for t in $TARGETS ; do # The gcc build system has some crazy pattern for how it names files, subvert it. +--- gcc/Makefile.in 2011-08-09 19:37:51.000000000 -0400 ++++ gcc/Makefile.in.sysroot 2013-07-08 08:26:55.000000000 -0400 +@@ -552,6 +552,7 @@ + build_tooldir = $(exec_prefix)/$(target_noncanonical) + # Directory in which the compiler finds target-independent g++ includes. + gcc_gxx_include_dir = @gcc_gxx_include_dir@ ++gcc_gxx_include_dir_add_sysroot = @gcc_gxx_include_dir_add_sysroot@ + # Directory to search for site-specific includes. + local_includedir = $(local_prefix)/include + includedir = $(prefix)/include +@@ -3419,6 +3420,7 @@ + PREPROCESSOR_DEFINES = \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ ++ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ + -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ +--- gcc/configure 2010-06-23 17:35:10.000000000 -0400 ++++ gcc/configure.sysroot 2013-07-08 10:19:16.000000000 -0400 +@@ -787,6 +787,7 @@ + float_h_file + gcc_config_arguments + gcc_gxx_include_dir ++gcc_gxx_include_dir_add_sysroot + host_exeext + host_xm_file_list + host_xm_include_list +@@ -2277,6 +2278,15 @@ + fi + fi + ++gcc_gxx_include_dir_add_sysroot=0 ++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}" ++ gcc_gxx_include_dir_add_sysroot=1 ++ fi ++fi ++ + + # Check whether --with-cpp_install_dir was given. + if test "${with_cpp_install_dir+set}" = set; then +@@ -8801,7 +8811,7 @@ + else + ac_prog_version=`$DSYMUTIL --version 2>&1 | + sed -n 's/^.*.*dwarfutils.\([0-9]*\).*$/\1/p'` +- echo "configure:8804: version of dsymutil is $ac_prog_version" >&5 ++ echo "configure:8814: version of dsymutil is $ac_prog_version" >&5 + case $ac_prog_version in + '') gcc_cv_prog_dsymutil_modern=no;; + 2[5-9]*) +@@ -8874,7 +8884,7 @@ + else + ac_prog_version=`$DSYMUTIL --version 2>&1 | + sed -n 's/^.*.*dwarfutils.\([0-9]*\).*$/\1/p'` +- echo "configure:8877: version of dsymutil is $ac_prog_version" >&5 ++ echo "configure:8887: version of dsymutil is $ac_prog_version" >&5 + case $ac_prog_version in + '') gcc_cv_prog_dsymutil_modern=no;; + [3-9][0-9]*) +@@ -9610,7 +9620,7 @@ + else + ac_prog_version=`$MAKEINFO --version 2>&1 | + sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` +- echo "configure:9613: version of makeinfo is $ac_prog_version" >&5 ++ echo "configure:9623: version of makeinfo is $ac_prog_version" >&5 + case $ac_prog_version in + '') gcc_cv_prog_makeinfo_modern=no;; + 4.[4-9]* | 4.1[0-9]*) +@@ -19107,6 +19117,7 @@ + + + ++ + # LLVM LOCAL + + +@@ -20012,8 +20023,8 @@ + float_h_file!$float_h_file$ac_delim + gcc_config_arguments!$gcc_config_arguments$ac_delim + gcc_gxx_include_dir!$gcc_gxx_include_dir$ac_delim ++gcc_gxx_include_dir_add_sysroot!$gcc_gxx_include_dir_add_sysroot$ac_delim + host_exeext!$host_exeext$ac_delim +-host_xm_file_list!$host_xm_file_list$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -20055,6 +20066,7 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++host_xm_file_list!$host_xm_file_list$ac_delim + host_xm_include_list!$host_xm_include_list$ac_delim + host_xm_defines!$host_xm_defines$ac_delim + out_host_hook_obj!$out_host_hook_obj$ac_delim +@@ -20089,7 +20101,7 @@ + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +--- gcc/configure.ac 2010-06-23 17:35:10.000000000 -0400 ++++ gcc/configure.ac.sysroot 2013-07-08 08:26:55.000000000 -0400 +@@ -147,6 +147,15 @@ + fi + fi + ++gcc_gxx_include_dir_add_sysroot=0 ++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}" ++ gcc_gxx_include_dir_add_sysroot=1 ++ fi ++fi ++ + AC_ARG_WITH(cpp_install_dir, + [ --with-cpp-install-dir=DIR + install the user visible C preprocessor in DIR +@@ -3735,6 +3744,7 @@ + AC_SUBST(float_h_file) + AC_SUBST(gcc_config_arguments) + AC_SUBST(gcc_gxx_include_dir) ++AC_SUBST(gcc_gxx_include_dir_add_sysroot) + AC_SUBST(host_exeext) + AC_SUBST(host_xm_file_list) + AC_SUBST(host_xm_include_list) +--- gcc/cppdefault.c 2009-03-13 17:36:35.000000000 -0400 ++++ gcc/cppdefault.c.sysroot 2013-07-08 08:30:49.000000000 -0400 +@@ -59,15 +59,18 @@ + = { + #ifdef GPLUSPLUS_INCLUDE_DIR + /* Pick up GNU C++ generic include files. */ +- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + #endif + #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR + /* Pick up GNU C++ target-dependent include files. */ +- { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 }, ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, + #endif + #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR + /* Pick up GNU C++ backward and deprecated include files. */ +- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, + #endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs