CVS commit: pkgsrc/lang/gcc6

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Fri Sep 30 17:17:37 UTC 2016

Modified Files:
        pkgsrc/lang/gcc6: distinfo
        pkgsrc/lang/gcc6/patches: patch-gcc_Makefile.in

Log Message:
Remove the whitespace between $(LINKER_RPATH_FLAG) and the path.
Otherwise the flag may be misinterpreted by linker (e.g. Apple's ld).


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc6/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc6/distinfo
diff -u pkgsrc/lang/gcc6/distinfo:1.3 pkgsrc/lang/gcc6/distinfo:1.4
--- pkgsrc/lang/gcc6/distinfo:1.3       Wed Sep 28 17:13:16 2016
+++ pkgsrc/lang/gcc6/distinfo   Fri Sep 30 17:17:37 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2016/09/28 17:13:16 maya Exp $
+$NetBSD: distinfo,v 1.4 2016/09/30 17:17:37 sevan Exp $
 
 SHA1 (gcc-6.2.0.tar.bz2) = 583e29c7fe69d9a1031a89752c2551ab5aeacb91
 RMD160 (gcc-6.2.0.tar.bz2) = d9154ca51f40ae3ce42950a0476f701a9f86fc95
@@ -8,7 +8,7 @@ SHA1 (isl-0.14.tar.bz2) = b09e25df265c97
 RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
 Size (isl-0.14.tar.bz2) = 1399896 bytes
-SHA1 (patch-gcc_Makefile.in) = ce366a091960d335ecb022918e2f7bfc4e3fcccf
+SHA1 (patch-gcc_Makefile.in) = 41d45e8988b59e6ffa7adb7833290d39fc1fd0e1
 SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550

Index: pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in
diff -u pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in:1.1 pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in:1.2
--- pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in:1.1  Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6/patches/patch-gcc_Makefile.in      Fri Sep 30 17:17:37 2016
@@ -1,7 +1,9 @@
-$NetBSD: patch-gcc_Makefile.in,v 1.1 2016/09/12 22:13:54 maya Exp $
+$NetBSD: patch-gcc_Makefile.in,v 1.2 2016/09/30 17:17:37 sevan Exp $
 
 Add gcc libdir to a programs rpath so that _this gcc's_ support libraries
-are found.
+are found. Note that there must not be a whitespace between
+$(LINKER_RPATH_FLAG) and the path. Otherwise the flag may be
+misinterpreted by linker (e.g. Apple's ld).
 
 --- gcc/Makefile.in.orig       2013-03-05 09:46:34.000000000 +0000
 +++ gcc/Makefile.in
@@ -9,7 +11,7 @@ are found.
  # Language-independent files.
  
  DRIVER_DEFINES = \
-+  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG) $(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG) $(libdir)/%M \"" \
++  -DLINK_LIBGCC_SPEC="\"%D $(LINKER_RPATH_FLAG)$(prefix)/@GCC_TARGET_MACHINE@/lib/%M $(LINKER_RPATH_FLAG)$(libdir)/%M \"" \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \