Author: ludo
Date: Fri Mar 16 13:11:41 2012
New Revision: 33154
URL: https://nixos.org/websvn/nix/?rev=33154&sc=1
Log:
GFortran 4.6: Add patch to fix the output of `-v'.
Added:
nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Fri Mar
16 13:00:27 2012 (r33153)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/default.nix Fri Mar
16 13:11:41 2012 (r33154)
@@ -54,6 +54,7 @@
# 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 {
Added: nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
Fri Mar 16 13:11:41 2012 (r33154)
@@ -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");
+ }
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
