diff options
author | maya <maya@pkgsrc.org> | 2017-07-22 18:05:43 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2017-07-22 18:05:43 +0000 |
commit | 2f48647405901ce58cf9cf882639bb26daeb7d6d (patch) | |
tree | ef093d604ce9507585ab4705fdaeaa9c684dafe9 /lang/g95 | |
parent | 1c37fd64245377154b1e62999e6ae7c850ceabe9 (diff) | |
download | pkgsrc-2f48647405901ce58cf9cf882639bb26daeb7d6d.tar.gz |
never include machine/ansi.h on freebsd.
use else if in our long conditional macro for symmetry
blind commit that may help freebsd builds
Diffstat (limited to 'lang/g95')
-rw-r--r-- | lang/g95/distinfo | 6 | ||||
-rw-r--r-- | lang/g95/patches/patch-gcc_config_freebsd-spec.h | 4 | ||||
-rw-r--r-- | lang/g95/patches/patch-gcc_ginclude_stddef.h | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/lang/g95/distinfo b/lang/g95/distinfo index e104f65e570..58bef9d3d44 100644 --- a/lang/g95/distinfo +++ b/lang/g95/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2017/06/21 11:36:20 maya Exp $ +$NetBSD: distinfo,v 1.31 2017/07/22 18:05:43 maya Exp $ SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 @@ -15,14 +15,14 @@ SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268 SHA1 (patch-gcc_config.gcc) = 41c7b8c86dc87032159126d33b33ae4d0265fb07 SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 -SHA1 (patch-gcc_config_freebsd-spec.h) = 508304b26b592518c3d3f43f466ac0a6542b2704 +SHA1 (patch-gcc_config_freebsd-spec.h) = fe3d6a06226a1ad9646baae17c7e322350fc6ee6 SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba SHA1 (patch-gcc_config_mips_netbsd.h) = 8888ecaa470e38a82ec56e332658fd32c9e5e86c SHA1 (patch-gcc_config_rs600_netbsd.h) = 2e568e48f84024b7182762107c4ee76ee87fe43c SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c -SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9 +SHA1 (patch-gcc_ginclude_stddef.h) = db0fade3d40f2354b1dd418c25e7254dc97e5bcf SHA1 (patch-gcc_toplev.h) = 6a51de1296e3a4711ce8fd37b1c95fe68b1e2c4e SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d SHA1 (patch-libf95.a-0.93_Makefile.am) = a5e6a8fa0cd05e6e4a581c027d97cdf68dd2a6f8 diff --git a/lang/g95/patches/patch-gcc_config_freebsd-spec.h b/lang/g95/patches/patch-gcc_config_freebsd-spec.h index 6dc7d6c706a..10e07eb15ac 100644 --- a/lang/g95/patches/patch-gcc_config_freebsd-spec.h +++ b/lang/g95/patches/patch-gcc_config_freebsd-spec.h @@ -1,4 +1,4 @@ -$NetBSD: patch-gcc_config_freebsd-spec.h,v 1.3 2016/09/27 20:51:11 maya Exp $ +$NetBSD: patch-gcc_config_freebsd-spec.h,v 1.4 2017/07/22 18:05:43 maya Exp $ Do not create duplicate definitions. Add support for FreeBSD 9 to 12 @@ -13,7 +13,7 @@ From FreeBSD ports. - if (FBSD_MAJOR == 9) \ + if (FBSD_MAJOR == 12) \ + builtin_define ("__FreeBSD__=12"); \ -+ if (FBSD_MAJOR == 11) \ ++ else if (FBSD_MAJOR == 11) \ + builtin_define ("__FreeBSD__=11"); \ + else if (FBSD_MAJOR == 10) \ + builtin_define ("__FreeBSD__=10"); \ diff --git a/lang/g95/patches/patch-gcc_ginclude_stddef.h b/lang/g95/patches/patch-gcc_ginclude_stddef.h index 72f31d263e8..2cc0cd2503e 100644 --- a/lang/g95/patches/patch-gcc_ginclude_stddef.h +++ b/lang/g95/patches/patch-gcc_ginclude_stddef.h @@ -1,9 +1,19 @@ -$NetBSD: patch-gcc_ginclude_stddef.h,v 1.1 2013/05/20 05:47:34 adam Exp $ +$NetBSD: patch-gcc_ginclude_stddef.h,v 1.2 2017/07/22 18:05:43 maya Exp $ DragonFly BSD support (_PTRDIFF_T_DECLARED is also needed on dfly). +Don't ever include machine/ansi.h on freebsd (removed in freebsd 5) --- ../gcc-4.1.2/gcc/ginclude/stddef.h.orig 2005-06-25 01:11:52.000000000 +0000 +++ ../gcc-4.1.2/gcc/ginclude/stddef.h +@@ -54,7 +54,7 @@ Boston, MA 02110-1301, USA. */ + + /* On 4.3bsd-net2, make sure ansi.h is included, so we have + one less case to deal with in the following. */ +-#if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__) ++#if defined (__BSD_NET2__) || defined (____386BSD____) || defined(__NetBSD__) + #include <machine/ansi.h> + #endif + /* On FreeBSD 5, machine/ansi.h does not exist anymore... */ @@ -62,6 +62,10 @@ Boston, MA 02110-1301, USA. */ #include <sys/_types.h> #endif |