diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-10-21 17:55:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-10-21 17:55:16 +0000 |
| commit | 43b1cd2d77f50b3e448416b9881a0d4fe2220e6b (patch) | |
| tree | ddbbafbd313c800727bc2840a62702b374109f67 /4.7.1 | |
| parent | applay more fixes to piepatchset 0.5.5 for gcc 4.7.2 (diff) | |
| download | gcc-patches-43b1cd2d77f50b3e448416b9881a0d4fe2220e6b.tar.gz gcc-patches-43b1cd2d77f50b3e448416b9881a0d4fe2220e6b.tar.bz2 gcc-patches-43b1cd2d77f50b3e448416b9881a0d4fe2220e6b.zip | |
fix from upstream for gfortran respecting sysroot settings #433435 by Andrew Aladjev
Diffstat (limited to '4.7.1')
| -rw-r--r-- | 4.7.1/gentoo/39_all_gfortran-sysroot-pr54725.patch | 62 | ||||
| -rw-r--r-- | 4.7.1/gentoo/README.history | 3 |
2 files changed, 65 insertions, 0 deletions
diff --git a/4.7.1/gentoo/39_all_gfortran-sysroot-pr54725.patch b/4.7.1/gentoo/39_all_gfortran-sysroot-pr54725.patch new file mode 100644 index 0000000..4645849 --- /dev/null +++ b/4.7.1/gentoo/39_all_gfortran-sysroot-pr54725.patch @@ -0,0 +1,62 @@ +https://bugs.gentoo.org/433435 +http://gcc.gnu.org/PR54725 +http://gcc.gnu.org/viewcvs?view=revision&revision=192650 + +make sure gfortran respects the sysroot + +gcc/ +2012-10-21 Tobias Burnus <burnus@net-b.de> + + PR fortran/54725 + * Makefile.in (TARGET_SYSTEM_ROOT_DEFINE): New. + +gcc/fortran +2012-10-21 Tobias Burnus <burnus@net-b.de> + + PR fortran/54725 + * Make-lang.in (CFLAGS-cpp.o): Use TARGET_SYSTEM_ROOT_DEFINE. + * cpp.o (gfc_cpp_init_options): Use it for + setting gfc_cpp_option.sysroot. + +--- trunk/gcc/Makefile.in 2012/10/21 10:32:02 192649 ++++ trunk/gcc/Makefile.in 2012/10/21 10:51:26 192650 +@@ -468,6 +468,7 @@ + # Directory for prefix to system directories, for + # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. + TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ ++TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ + + xmake_file=@xmake_file@ + tmake_file=@tmake_file@ +--- trunk/gcc/fortran/Make-lang.in 2012/10/21 10:32:02 192649 ++++ trunk/gcc/fortran/Make-lang.in 2012/10/21 10:51:26 192650 +@@ -341,6 +341,7 @@ + $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TM_H) coretypes.h $(GGC_H) \ + fortran/iso-c-binding.def fortran/iso-fortran-env.def + ++CFLAGS-fortran/cpp.o += $(TARGET_SYSTEM_ROOT_DEFINE) + fortran/f95-lang.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \ + gt-fortran-f95-lang.h gtype-fortran.h $(CGRAPH_H) $(TARGET_H) fortran/cpp.h \ + $(BUILTINS_DEF) fortran/types.def \ +--- trunk/gcc/fortran/cpp.c 2012/10/21 10:32:02 192649 ++++ trunk/gcc/fortran/cpp.c 2012/10/21 10:51:26 192650 +@@ -38,6 +38,10 @@ + #include "cppbuiltin.h" + #include "mkdeps.h" + ++#ifndef TARGET_SYSTEM_ROOT ++# define TARGET_SYSTEM_ROOT NULL ++#endif ++ + #ifndef TARGET_CPU_CPP_BUILTINS + # define TARGET_CPU_CPP_BUILTINS() + #endif +@@ -267,7 +271,7 @@ + + gfc_cpp_option.multilib = NULL; + gfc_cpp_option.prefix = NULL; +- gfc_cpp_option.sysroot = NULL; ++ gfc_cpp_option.sysroot = TARGET_SYSTEM_ROOT; + + gfc_cpp_option.deferred_opt = XNEWVEC (gfc_cpp_deferred_opt_t, + decoded_options_count); diff --git a/4.7.1/gentoo/README.history b/4.7.1/gentoo/README.history index ad49b8a..4fabf02 100644 --- a/4.7.1/gentoo/README.history +++ b/4.7.1/gentoo/README.history @@ -1,3 +1,6 @@ +1.5 21 Oct 2012 + + 39_all_gfortran-sysroot-pr54725.patch + 1.4 27 Sep 2012 + 15_all_libgfortran-Werror.patch |