CVS commit: [pkgsrc-2017Q3] pkgsrc/lang/g95

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Nov  4 17:58:27 UTC 2017

Modified Files:
        pkgsrc/lang/g95 [pkgsrc-2017Q3]: distinfo
        pkgsrc/lang/g95/patches [pkgsrc-2017Q3]: patch-ab

Log Message:
Pullup ticket #5596 - requested by sevan
lang/g95: build fix

Revisions pulled up:
- lang/g95/distinfo                                             1.32
- lang/g95/patches/patch-ab                                     1.9

---
   Module Name:    pkgsrc
   Committed By:   khorben
   Date:           Fri Oct 27 20:57:16 UTC 2017

   Modified Files:
           pkgsrc/lang/g95: distinfo
           pkgsrc/lang/g95/patches: patch-ab

   Log Message:
   Apply CFLAGS to the whole build process for lang/g95

   This fixes building g95 with PKGSRC_MKPIE=yes without cwrappers.
   A separate fix for the same issue with cwrappers is on its way.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.4.1 pkgsrc/lang/g95/distinfo
cvs rdiff -u -r1.8 -r1.8.36.1 pkgsrc/lang/g95/patches/patch-ab

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

Modified files:

Index: pkgsrc/lang/g95/distinfo
diff -u pkgsrc/lang/g95/distinfo:1.31 pkgsrc/lang/g95/distinfo:1.31.4.1
--- pkgsrc/lang/g95/distinfo:1.31       Sat Jul 22 18:05:43 2017
+++ pkgsrc/lang/g95/distinfo    Sat Nov  4 17:58:27 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2017/07/22 18:05:43 maya Exp $
+$NetBSD: distinfo,v 1.31.4.1 2017/11/04 17:58:27 bsiegert Exp $
 
 SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
 RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
@@ -8,7 +8,7 @@ SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295
 RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5
 SHA512 (gcc-core-4.1.2.tar.bz2) = 002a2025f809781e8d427c00dfe884429ae094ad417edc3393f5bae249ae6049ea0c27e43caf51f9f15525bd35e24ad2c993c57f191b9196fdb68fd20e503f6e
 Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes
-SHA1 (patch-ab) = 7429a4da26aa573dcdd94bf417da1e009f95d273
+SHA1 (patch-ab) = a8ec156302d30374b05d520bfe0141ab9d97e1ef
 SHA1 (patch-configure) = 48450808201d4ea5ddb993627c4efeaf43d53bd2
 SHA1 (patch-g95spec.c) = d6f434e715835cd39511c45ed18632c8401b78a2
 SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268

Index: pkgsrc/lang/g95/patches/patch-ab
diff -u pkgsrc/lang/g95/patches/patch-ab:1.8 pkgsrc/lang/g95/patches/patch-ab:1.8.36.1
--- pkgsrc/lang/g95/patches/patch-ab:1.8        Fri Sep 20 23:06:07 2013
+++ pkgsrc/lang/g95/patches/patch-ab    Sat Nov  4 17:58:27 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2013/09/20 23:06:07 joerg Exp $
+$NetBSD: patch-ab,v 1.8.36.1 2017/11/04 17:58:27 bsiegert Exp $
 
 Use $(host_alias) as the program prefix so it matches ${MACHINE_GNU_PLATFORM}
 
@@ -35,3 +35,14 @@ Pass down correct path for libf95 to g95
        if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_s.*`" ; then \
           (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_s.*) | \
             (cd $(DESTDIR)@DEST_LIBDIR@; tar xf -) ; \
+@@ -1445,8 +1447,8 @@ install-data-hook:
+       fi
+ 
+ ggc-page.o: $(srcdir)/ggc-page40.c $(srcdir)/ggc-page41.c
+-@GCC41_TRUE@  $(CC) -c -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC $(srcdir)/ggc-page41.c
+-@GCC41_FALSE@ $(CC) -c -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC $(srcdir)/ggc-page40.c
++@GCC41_TRUE@  $(CC) -c $(CFLAGS) -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC $(srcdir)/ggc-page41.c
++@GCC41_FALSE@ $(CC) -c $(CFLAGS) -g -o ggc-page.o -I. $(CPPFLAGS) -DIN_GCC $(srcdir)/ggc-page40.c
+ 
+ options.h options.o: $(srcdir)/lang.opt
+       $(AWK) -f @GCC_DIR@/gcc/opt-functions.awk \