diff options
| author | asau <asau@pkgsrc.org> | 2013-09-23 17:56:32 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2013-09-23 17:56:32 +0000 |
| commit | 8a2b83405c4b1dbc4acd6885e520bef4c66e0e57 (patch) | |
| tree | 600a885bc740591266359ca92c99b97ef54cbe28 | |
| parent | f373e3d587f080e98807f98fcb9f0e5e414bc4a7 (diff) | |
| download | pkgsrc-8a2b83405c4b1dbc4acd6885e520bef4c66e0e57.tar.gz | |
Do not create duplicate definitions. From FreeBSD ports.
This fixes package on FreeBSD.
| -rw-r--r-- | lang/g95/PLIST.FreeBSD | 5 | ||||
| -rw-r--r-- | lang/g95/distinfo | 3 | ||||
| -rw-r--r-- | lang/g95/patches/patch-gcc_config_freebsd-spec.h | 23 |
3 files changed, 30 insertions, 1 deletions
diff --git a/lang/g95/PLIST.FreeBSD b/lang/g95/PLIST.FreeBSD new file mode 100644 index 00000000000..b1a0b78be81 --- /dev/null +++ b/lang/g95/PLIST.FreeBSD @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST.FreeBSD,v 1.1 2013/09/23 17:56:32 asau Exp $ +lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.1.2/crtbegin.o +lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.1.2/crtbeginS.o +lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.1.2/crtend.o +lib/gcc-lib/${MACHINE_GNU_PLATFORM}/4.1.2/crtendS.o diff --git a/lang/g95/distinfo b/lang/g95/distinfo index 25e538ec42b..7b8b1e40419 100644 --- a/lang/g95/distinfo +++ b/lang/g95/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2013/09/20 23:06:07 joerg Exp $ +$NetBSD: distinfo,v 1.18 2013/09/23 17:56:32 asau Exp $ SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 @@ -13,6 +13,7 @@ SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268 SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959 SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 +SHA1 (patch-gcc_config_freebsd-spec.h) = 8a1b78b479a386caec14e6a6333fde4a8af6de2c SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 diff --git a/lang/g95/patches/patch-gcc_config_freebsd-spec.h b/lang/g95/patches/patch-gcc_config_freebsd-spec.h new file mode 100644 index 00000000000..675efa8b81f --- /dev/null +++ b/lang/g95/patches/patch-gcc_config_freebsd-spec.h @@ -0,0 +1,23 @@ +$NetBSD: patch-gcc_config_freebsd-spec.h,v 1.1 2013/09/23 17:56:32 asau Exp $ + +Do not create duplicate definitions. +From FreeBSD ports. + +--- ../gcc-4.1.2/gcc/config/freebsd-spec.h.orig 2005-07-20 13:12:58.000000000 +0200 ++++ ../gcc-4.1.2/gcc/config/freebsd-spec.h 2012-06-20 15:57:35.000000000 +0200 +@@ -51,11 +51,13 @@ + #define FBSD_TARGET_OS_CPP_BUILTINS() \ + do \ + { \ +- if (FBSD_MAJOR == 9) \ ++ if (FBSD_MAJOR == 10) \ ++ builtin_define ("__FreeBSD__=10"); \ ++ else if (FBSD_MAJOR == 9) \ + builtin_define ("__FreeBSD__=9"); \ + else if (FBSD_MAJOR == 8) \ + builtin_define ("__FreeBSD__=8"); \ +- if (FBSD_MAJOR == 7) \ ++ else if (FBSD_MAJOR == 7) \ + builtin_define ("__FreeBSD__=7"); \ + else if (FBSD_MAJOR == 6) \ + builtin_define ("__FreeBSD__=6"); \ |