diff options
| author | khorben <khorben@pkgsrc.org> | 2017-10-27 20:57:16 +0000 |
|---|---|---|
| committer | khorben <khorben@pkgsrc.org> | 2017-10-27 20:57:16 +0000 |
| commit | 0a5c16211c079bdd3c7d81cad0691dd39427ab97 (patch) | |
| tree | d723d837f5982e84e98fc874fad008d539ed30c7 | |
| parent | aeb11517949be8e26525ee8bb7034defd3a1b5d5 (diff) | |
| download | pkgsrc-0a5c16211c079bdd3c7d81cad0691dd39427ab97.tar.gz | |
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.
| -rw-r--r-- | lang/g95/distinfo | 4 | ||||
| -rw-r--r-- | lang/g95/patches/patch-ab | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lang/g95/distinfo b/lang/g95/distinfo index 58bef9d3d44..2ac067386a2 100644 --- a/lang/g95/distinfo +++ b/lang/g95/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2017/07/22 18:05:43 maya Exp $ +$NetBSD: distinfo,v 1.32 2017/10/27 20:57:16 khorben Exp $ SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 @@ -8,7 +8,7 @@ SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 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 diff --git a/lang/g95/patches/patch-ab b/lang/g95/patches/patch-ab index 5ada1e7fd44..41e31a5da5b 100644 --- a/lang/g95/patches/patch-ab +++ b/lang/g95/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.8 2013/09/20 23:06:07 joerg Exp $ +$NetBSD: patch-ab,v 1.9 2017/10/27 20:57:16 khorben 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 g95specs.c. 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 \ |