Tue Sep 27 20:51:11 2016 UTC ()
g95: preliminary support for FreeBSD-12, minor rototilling.
Don't fail in configure.


(maya)
diff -r1.25 -r1.26 pkgsrc/lang/g95/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/g95/patches/patch-gcc_config.gcc
diff -r1.2 -r1.3 pkgsrc/lang/g95/patches/patch-gcc_config_freebsd-spec.h
cvs diff -r1.25 -r1.26 pkgsrc/lang/g95/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/g95/distinfo 2015/12/29 23:34:46 1.25
+++ pkgsrc/lang/g95/distinfo 2016/09/27 20:51:11 1.26
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: distinfo,v 1.25 2015/12/29 23:34:46 dholland Exp $ 1$NetBSD: distinfo,v 1.26 2016/09/27 20:51:11 maya Exp $
2 2
3SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff 3SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
4RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 4RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
5SHA512 (g95_source.tgz) = b464efd6a36bfe3cc63234d82db1f22d3f023bd3e25e6f86569c5bbb9a27fbf142f53c8dd789080a912087230ddabca5ffd324cc4125f8c96acfa367d2f0024f 5SHA512 (g95_source.tgz) = b464efd6a36bfe3cc63234d82db1f22d3f023bd3e25e6f86569c5bbb9a27fbf142f53c8dd789080a912087230ddabca5ffd324cc4125f8c96acfa367d2f0024f
6Size (g95_source.tgz) = 1355198 bytes 6Size (g95_source.tgz) = 1355198 bytes
7SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 7SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306
8RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 8RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5
9SHA512 (gcc-core-4.1.2.tar.bz2) = 002a2025f809781e8d427c00dfe884429ae094ad417edc3393f5bae249ae6049ea0c27e43caf51f9f15525bd35e24ad2c993c57f191b9196fdb68fd20e503f6e 9SHA512 (gcc-core-4.1.2.tar.bz2) = 002a2025f809781e8d427c00dfe884429ae094ad417edc3393f5bae249ae6049ea0c27e43caf51f9f15525bd35e24ad2c993c57f191b9196fdb68fd20e503f6e
10Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes 10Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes
11SHA1 (patch-ab) = 7429a4da26aa573dcdd94bf417da1e009f95d273 11SHA1 (patch-ab) = 7429a4da26aa573dcdd94bf417da1e009f95d273
12SHA1 (patch-configure) = 48450808201d4ea5ddb993627c4efeaf43d53bd2 12SHA1 (patch-configure) = 48450808201d4ea5ddb993627c4efeaf43d53bd2
13SHA1 (patch-g95spec.c) = d6f434e715835cd39511c45ed18632c8401b78a2 13SHA1 (patch-g95spec.c) = d6f434e715835cd39511c45ed18632c8401b78a2
14SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268 14SHA1 (patch-gcc_Makefile.in) = cc5cc142a85612ebf2d38513e4b05db0ae795268
15SHA1 (patch-gcc_config.gcc) = 36d6af33ee7997d67179090114dfd8fc3e403a74 15SHA1 (patch-gcc_config.gcc) = ed135c425730d231182e36af840278d307396c6e
16SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 16SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511
17SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 17SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9
18SHA1 (patch-gcc_config_freebsd-spec.h) = 58eb1a97c243da253f7be070521ed4b6ea6c2c76 18SHA1 (patch-gcc_config_freebsd-spec.h) = 508304b26b592518c3d3f43f466ac0a6542b2704
19SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 19SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9
20SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba 20SHA1 (patch-gcc_config_i386_dragonfly64.h) = 9d2d8512a913e58055fa5c1b7d85a109117dcfba
21SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 21SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155
22SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c 22SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c
23SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9 23SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9
24SHA1 (patch-gcc_toplev.h) = 6a51de1296e3a4711ce8fd37b1c95fe68b1e2c4e 24SHA1 (patch-gcc_toplev.h) = 6a51de1296e3a4711ce8fd37b1c95fe68b1e2c4e
25SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d 25SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d
26SHA1 (patch-libf95.a-0.93_Makefile.am) = a5e6a8fa0cd05e6e4a581c027d97cdf68dd2a6f8 26SHA1 (patch-libf95.a-0.93_Makefile.am) = a5e6a8fa0cd05e6e4a581c027d97cdf68dd2a6f8
27SHA1 (patch-libf95.a-0.93_configure.in) = b81b36f574f6f40ce43bbd371cdb93d388d83b5d 27SHA1 (patch-libf95.a-0.93_configure.in) = b81b36f574f6f40ce43bbd371cdb93d388d83b5d
28SHA1 (patch-libf95.a-0.93_intrinsics_dot__product10.c) = 44677d0004c68597519b0cea8b899ae4f63b8807 28SHA1 (patch-libf95.a-0.93_intrinsics_dot__product10.c) = 44677d0004c68597519b0cea8b899ae4f63b8807
29SHA1 (patch-libf95.a-0.93_intrinsics_matmul10.c) = a4b49b8579b6ebce57715d8b56f4d4eac2ee7f88 29SHA1 (patch-libf95.a-0.93_intrinsics_matmul10.c) = a4b49b8579b6ebce57715d8b56f4d4eac2ee7f88
30SHA1 (patch-libf95.a-0.93_intrinsics_random.c) = 56319be898fd2df8b0fd1d98d05db272ce303fe3 30SHA1 (patch-libf95.a-0.93_intrinsics_random.c) = 56319be898fd2df8b0fd1d98d05db272ce303fe3
31SHA1 (patch-libf95.a-0.93_io_read.c) = 46b4c4f6df2cc488c0a7622121a4456bb8b05416 31SHA1 (patch-libf95.a-0.93_io_read.c) = 46b4c4f6df2cc488c0a7622121a4456bb8b05416
cvs diff -r1.3 -r1.4 pkgsrc/lang/g95/patches/patch-gcc_config.gcc (expand / switch to unified diff)

--- pkgsrc/lang/g95/patches/patch-gcc_config.gcc 2015/10/07 10:36:54 1.3
+++ pkgsrc/lang/g95/patches/patch-gcc_config.gcc 2016/09/27 20:51:11 1.4
@@ -1,65 +1,67 @@ @@ -1,65 +1,67 @@
1$NetBSD: patch-gcc_config.gcc,v 1.3 2015/10/07 10:36:54 sevan Exp $ 1$NetBSD: patch-gcc_config.gcc,v 1.4 2016/09/27 20:51:11 maya Exp $
2 2
3Darwin 64-bit support. 3Darwin 64-bit support.
4DragonFly BSD support. 4DragonFly BSD support.
5FreeBSD 10 & 11 support. 5FreeBSD 10 to 12 support.
6 6
7--- ../gcc-4.1.2/gcc/config.gcc.orig 2006-10-15 23:12:23.000000000 +0000 7--- ../gcc-4.1.2/gcc/config.gcc.orig 2006-10-15 23:12:23.000000000 +0000
8+++ ../gcc-4.1.2/gcc/config.gcc 8+++ ../gcc-4.1.2/gcc/config.gcc
9@@ -412,6 +412,10 @@ case ${target} in 9@@ -412,6 +412,12 @@ case ${target} in
10 tm_defines="${tm_defines} FBSD_MAJOR=8" ;; 10 tm_defines="${tm_defines} FBSD_MAJOR=8" ;;
11 *-*-freebsd9 | *-*-freebsd[9].*) 11 *-*-freebsd9 | *-*-freebsd[9].*)
12 tm_defines="${tm_defines} FBSD_MAJOR=9" ;; 12 tm_defines="${tm_defines} FBSD_MAJOR=9" ;;
13+ *-*-freebsd10 | *-*-freebsd10.*) 13+ *-*-freebsd10 | *-*-freebsd10.*)
14+ tm_defines="${tm_defines} FBSD_MAJOR=10" ;; 14+ tm_defines="${tm_defines} FBSD_MAJOR=10" ;;
15+ *-*-freebsd11 | *-*-freebsd11.*) 15+ *-*-freebsd11 | *-*-freebsd11.*)
16+ tm_defines="${tm_defines} FBSD_MAJOR=11" ;; 16+ tm_defines="${tm_defines} FBSD_MAJOR=11" ;;
 17+ *-*-freebsd12 | *-*-freebsd12.*)
 18+ tm_defines="${tm_defines} FBSD_MAJOR=12" ;;
17 *) 19 *)
18 echo 'Please update *-*-freebsd* in gcc/config.gcc' 20 echo 'Please update *-*-freebsd* in gcc/config.gcc'
19 exit 1 21 exit 1
20@@ -440,6 +444,23 @@ case ${target} in 22@@ -440,6 +446,23 @@ case ${target} in
21 esac 23 esac
22 fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h" 24 fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
23 ;; 25 ;;
24+*-*-dragonfly*) 26+*-*-dragonfly*)
25+ gas=yes 27+ gas=yes
26+ gnu_ld=yes 28+ gnu_ld=yes
27+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" 29+ extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
28+ tmake_file="t-slibgcc-elf-ver t-dragonfly" 30+ tmake_file="t-slibgcc-elf-ver t-dragonfly"
29+ case ${enable_threads} in 31+ case ${enable_threads} in
30+ "" | yes | posix) 32+ "" | yes | posix)
31+ thread_file='posix' 33+ thread_file='posix'
32+ tmake_file="${tmake_file} t-dragonfly-thread" 34+ tmake_file="${tmake_file} t-dragonfly-thread"
33+ ;; 35+ ;;
34+ *) 36+ *)
35+ echo 'Unknown thread configuration for FreeBSD' 37+ echo 'Unknown thread configuration for FreeBSD'
36+ exit 1 38+ exit 1
37+ ;; 39+ ;;
38+ esac 40+ esac
39+ dfly_tm_file="${dfly_tm_file} dragonfly-spec.h dragonfly.h" 41+ dfly_tm_file="${dfly_tm_file} dragonfly-spec.h dragonfly.h"
40+ ;; 42+ ;;
41 *-*-linux*libc1* | *-*-linux*aout*) 43 *-*-linux*libc1* | *-*-linux*aout*)
42 # Avoid the generic linux case. 44 # Avoid the generic linux case.
43 ;; 45 ;;
44@@ -981,6 +1002,8 @@ hppa[12]*-*-hpux11*) 46@@ -981,6 +1004,8 @@ hppa[12]*-*-hpux11*)
45 i[34567]86-*-darwin*) 47 i[34567]86-*-darwin*)
46 # All the configuration is presently done generically. 48 # All the configuration is presently done generically.
47 ;; 49 ;;
48+x86_64-*-darwin*) 50+x86_64-*-darwin*)
49+ ;; 51+ ;;
50 i[34567]86-*-elf*) 52 i[34567]86-*-elf*)
51 tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h" 53 tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
52 tmake_file="i386/t-i386elf t-svr4" 54 tmake_file="i386/t-i386elf t-svr4"
53@@ -1012,6 +1035,12 @@ i[34567]86-*-freebsd*) 55@@ -1012,6 +1037,12 @@ i[34567]86-*-freebsd*)
54 x86_64-*-freebsd*) 56 x86_64-*-freebsd*)
55 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" 57 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"
56 ;; 58 ;;
57+i[34567]86-*-dragonfly*) 59+i[34567]86-*-dragonfly*)
58+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfly_tm_file} i386/dragonfly.h" 60+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfly_tm_file} i386/dragonfly.h"
59+ ;; 61+ ;;
60+x86_64-*-dragonfly*) 62+x86_64-*-dragonfly*)
61+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfly_tm_file} i386/x86-64.h i386/dragonfly.h i386/dragonfly64.h" 63+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${dfly_tm_file} i386/x86-64.h i386/dragonfly.h i386/dragonfly64.h"
62+ ;; 64+ ;;
63 i[34567]86-*-netbsdelf*) 65 i[34567]86-*-netbsdelf*)
64 tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h" 66 tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
65 ;; 67 ;;
cvs diff -r1.2 -r1.3 pkgsrc/lang/g95/patches/patch-gcc_config_freebsd-spec.h (expand / switch to unified diff)

--- pkgsrc/lang/g95/patches/patch-gcc_config_freebsd-spec.h 2015/10/07 10:36:54 1.2
+++ pkgsrc/lang/g95/patches/patch-gcc_config_freebsd-spec.h 2016/09/27 20:51:11 1.3
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1$NetBSD: patch-gcc_config_freebsd-spec.h,v 1.2 2015/10/07 10:36:54 sevan Exp $ 1$NetBSD: patch-gcc_config_freebsd-spec.h,v 1.3 2016/09/27 20:51:11 maya Exp $
2 2
3Do not create duplicate definitions. 3Do not create duplicate definitions.
4Add support for FreeBSD 9 to 11 4Add support for FreeBSD 9 to 12
5From FreeBSD ports. 5From FreeBSD ports.
6 6
7--- ../gcc-4.1.2/gcc/config/freebsd-spec.h.orig 2005-07-19 13:42:12.000000000 +0000 7--- ../gcc-4.1.2/gcc/config/freebsd-spec.h.orig 2005-07-19 13:42:12.000000000 +0000
8+++ ../gcc-4.1.2/gcc/config/freebsd-spec.h 8+++ ../gcc-4.1.2/gcc/config/freebsd-spec.h
9@@ -51,11 +51,15 @@ Boston, MA 02110-1301, USA. */ 9@@ -51,11 +51,17 @@ Boston, MA 02110-1301, USA. */
10 #define FBSD_TARGET_OS_CPP_BUILTINS() \ 10 #define FBSD_TARGET_OS_CPP_BUILTINS() \
11 do \ 11 do \
12 { \ 12 { \
13- if (FBSD_MAJOR == 9) \ 13- if (FBSD_MAJOR == 9) \
 14+ if (FBSD_MAJOR == 12) \
 15+ builtin_define ("__FreeBSD__=12"); \
14+ if (FBSD_MAJOR == 11) \ 16+ if (FBSD_MAJOR == 11) \
15+ builtin_define ("__FreeBSD__=11"); \ 17+ builtin_define ("__FreeBSD__=11"); \
16+ else if (FBSD_MAJOR == 10) \ 18+ else if (FBSD_MAJOR == 10) \
17+ builtin_define ("__FreeBSD__=10"); \ 19+ builtin_define ("__FreeBSD__=10"); \
18+ else if (FBSD_MAJOR == 9) \ 20+ else if (FBSD_MAJOR == 9) \
19 builtin_define ("__FreeBSD__=9"); \ 21 builtin_define ("__FreeBSD__=9"); \
20 else if (FBSD_MAJOR == 8) \ 22 else if (FBSD_MAJOR == 8) \
21 builtin_define ("__FreeBSD__=8"); \ 23 builtin_define ("__FreeBSD__=8"); \
22- if (FBSD_MAJOR == 7) \ 24- if (FBSD_MAJOR == 7) \
23+ else if (FBSD_MAJOR == 7) \ 25+ else if (FBSD_MAJOR == 7) \
24 builtin_define ("__FreeBSD__=7"); \ 26 builtin_define ("__FreeBSD__=7"); \
25 else if (FBSD_MAJOR == 6) \ 27 else if (FBSD_MAJOR == 6) \
26 builtin_define ("__FreeBSD__=6"); \ 28 builtin_define ("__FreeBSD__=6"); \