CVS commit: pkgsrc/lang/gcc6

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Jan  7 13:46:14 UTC 2019

Modified Files:
        pkgsrc/lang/gcc6: distinfo
        pkgsrc/lang/gcc6/patches: patch-gcc_config.gcc

Log Message:
Add a comment to the patch, and add the netbsd-stdint.h
header for NetBSD/powerpc, so that the macppc version builds.
Thanks to maya@ for the hint.
No revision bump, as this is only a build fix for NetBSD/powerpc.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/gcc6/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc

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.13 pkgsrc/lang/gcc6/distinfo:1.14
--- pkgsrc/lang/gcc6/distinfo:1.13      Fri Nov 23 19:28:30 2018
+++ pkgsrc/lang/gcc6/distinfo   Mon Jan  7 13:46:14 2019
@@ -1,15 +1,7 @@
-$NetBSD: distinfo,v 1.13 2018/11/23 19:28:30 abs Exp $
+$NetBSD: distinfo,v 1.14 2019/01/07 13:46:14 he Exp $
 
-SHA1 (gcc-6.5.0.tar.xz) = 368b3f5d294b1a8727b372ac0a77703d8b41968a
-RMD160 (gcc-6.5.0.tar.xz) = 66782b17cff89f22e5e8869fa96bd9a8985f5067
-SHA512 (gcc-6.5.0.tar.xz) = ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
-Size (gcc-6.5.0.tar.xz) = 74355588 bytes
-SHA1 (isl-0.14.tar.bz2) = b09e25df265c97ed54002cd811d227a9a26c5f9c
-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) = 41d45e8988b59e6ffa7adb7833290d39fc1fd0e1
-SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d
+SHA1 (patch-gcc_config.gcc) = 6795fc4f852019faef686d6a8a2ede29945b2736
 SHA1 (patch-gcc_config.host) = 5dd1b72be5d520ebc679c79cbe92317eaf66028f
 SHA1 (patch-gcc_config_arm_arm.h) = e69b7f89ba245847f58253675a16749890b9d1ae
 SHA1 (patch-gcc_config_host-netbsd.c) = 765295f07edb8a68f1910e3a9b4dd2a7dcd491a5

Index: pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc
diff -u pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc:1.3 pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc:1.4
--- pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc:1.3   Wed Sep 28 17:13:16 2016
+++ pkgsrc/lang/gcc6/patches/patch-gcc_config.gcc       Mon Jan  7 13:46:14 2019
@@ -1,8 +1,10 @@
-$NetBSD: patch-gcc_config.gcc,v 1.3 2016/09/28 17:13:16 maya Exp $
+$NetBSD: patch-gcc_config.gcc,v 1.4 2019/01/07 13:46:14 he Exp $
+
+Adjust for target includes and crt make.
 
 --- gcc/config.gcc.orig        2014-11-21 16:04:20.000000000 +0000
 +++ gcc/config.gcc
-@@ -745,10 +745,16 @@ case ${target} in
+@@ -769,10 +769,16 @@ case ${target} in
    target_has_targetcm=yes
    ;;
  *-*-netbsd*)
@@ -20,7 +22,7 @@ $NetBSD: patch-gcc_config.gcc,v 1.3 2016
    # NetBSD 2.0 and later get POSIX threads enabled by default.
    # Allow them to be explicitly enabled on any other version.
    case ${enable_threads} in
-@@ -1372,12 +1378,14 @@ x86_64-*-freebsd*)
+@@ -1465,12 +1471,14 @@ x86_64-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
        ;;
  i[34567]86-*-netbsdelf*)
@@ -37,3 +39,12 @@ $NetBSD: patch-gcc_config.gcc,v 1.3 2016
        ;;
  i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
        tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
+@@ -2358,7 +2366,7 @@ powerpc*-*-freebsd*)
+       esac
+       ;;
+ powerpc-*-netbsd*)
+-      tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
++      tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h netbsd-stdint.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+       tmake_file="${tmake_file} rs6000/t-netbsd"
+       extra_options="${extra_options} rs6000/sysv4.opt"