diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-03-16 13:11:41 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-03-16 13:11:41 +0000 |
| commit | cc6f814a8f0e9b70ede5b24192558664fa1f98a2 (patch) | |
| tree | c6c2e7b089da6ad9e3a7ac37f44ff9bc10314b93 /pkgs/development/compilers | |
| parent | a3b099d27901f61e3e1c8e530b709cd213ffd4fd (diff) | |
| download | nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.tar nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.tar.gz nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.tar.bz2 nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.tar.lz nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.tar.xz nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.tar.zst nixpkgs-cc6f814a8f0e9b70ede5b24192558664fa1f98a2.zip | |
GFortran 4.6: Add patch to fix the output of `-v'.
svn path=/nixpkgs/trunk/; revision=33154
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/gfortran-driving.patch | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 7fd65b5fecb..bceaf2b4426 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -54,6 +54,7 @@ let version = "4.6.3"; # target libraries and tools. ++ optional langAda ./gnat-cflags.patch ++ optional langVhdl ./ghdl-ortho-cflags.patch + ++ optional langFortran ./gfortran-driving.patch ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch; javaEcj = fetchurl { diff --git a/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch new file mode 100644 index 00000000000..70708886b40 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch @@ -0,0 +1,20 @@ +This patch fixes interaction with Libtool. +See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details. + +--- a/gcc/fortran/gfortranspec.c ++++ b/gcc/fortran/gfortranspec.c +@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); + { + fprintf (stderr, _("Driving:")); + for (i = 0; i < g77_newargc; i++) ++ { ++ if (g77_new_decoded_options[i].opt_index == OPT_l) ++ /* Make sure no white space is inserted after `-l'. */ ++ fprintf (stderr, " -l%s", ++ g77_new_decoded_options[i].canonical_option[1]); ++ else + fprintf (stderr, " %s", + g77_new_decoded_options[i].orig_option_with_args_text); ++ } + fprintf (stderr, "\n"); + } |