Sun Nov 24 09:23:14 2019 UTC ()
ocaml: fix installation on Darwin + minor cleanups


(adam)
diff -r1.130 -r1.131 pkgsrc/lang/ocaml/Makefile
diff -r1.56 -r1.57 pkgsrc/lang/ocaml/Makefile.common
diff -r1.132 -r1.133 pkgsrc/lang/ocaml/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/ocaml/options.mk
diff -r1.39 -r1.40 pkgsrc/lang/ocaml/patches/patch-configure
cvs diff -r1.130 -r1.131 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2019/10/04 10:33:21 1.130
+++ pkgsrc/lang/ocaml/Makefile 2019/11/24 09:23:13 1.131
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.130 2019/10/04 10:33:21 maya Exp $ 1# $NetBSD: Makefile,v 1.131 2019/11/24 09:23:13 adam Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGREVISION= 2 5PKGREVISION= 2
6 6
7BUILD_TARGET= world 7BUILD_TARGET= world
8MAKE_JOBS_SAFE= no 8MAKE_JOBS_SAFE= no
9UNLIMIT_RESOURCES= stacksize 9UNLIMIT_RESOURCES= stacksize
10 10
11USE_TOOLS+= bash 11USE_TOOLS+= bash
12USE_LANGUAGES+= c 12USE_LANGUAGES+= c
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_GNU_CONFIGURE_HOST= no 14USE_GNU_CONFIGURE_HOST= no
@@ -87,23 +87,26 @@ OPSYSVARS+= EXTRA_RT_LIBS @@ -87,23 +87,26 @@ OPSYSVARS+= EXTRA_RT_LIBS
87EXTRA_RT_LIBS.NetBSD= -lcurses 87EXTRA_RT_LIBS.NetBSD= -lcurses
88EXTRA_RT_LIBS.*= 88EXTRA_RT_LIBS.*=
89 89
90PRINT_PLIST_AWK+= { gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); } 90PRINT_PLIST_AWK+= { gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
91 91
92.if defined(PLIST.instrumented_runtime) 92.if defined(PLIST.instrumented_runtime)
93REPLACE_BASH+= tools/ocaml-instr-graph 93REPLACE_BASH+= tools/ocaml-instr-graph
94REPLACE_AWK+= tools/ocaml-instr-report 94REPLACE_AWK+= tools/ocaml-instr-report
95.endif 95.endif
96 96
97do-test: 97do-test:
98 cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all 98 cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
99 99
100#post-install: 100.if ${OPSYS} == "Darwin"
101# set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1; \ 101.PHONY: fix-darwin-install-name
102# for m in *; do \ 102post-install: fix-darwin-install-name
103# ln -sf ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m \ 103fix-darwin-install-name:
104# ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m; \ 104 for f in ${DESTDIR}${PREFIX}/lib/ocaml/*.so \
105# done 105 ${DESTDIR}${PREFIX}/lib/ocaml/stublibs/*.so; do \
 106 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
 107 done
 108.endif
106 109
107.include "../../mk/dlopen.buildlink3.mk" 110.include "../../mk/dlopen.buildlink3.mk"
108.include "../../mk/termcap.buildlink3.mk" 111.include "../../mk/termcap.buildlink3.mk"
109.include "../../mk/bsd.pkg.mk" 112.include "../../mk/bsd.pkg.mk"
cvs diff -r1.56 -r1.57 pkgsrc/lang/ocaml/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile.common 2019/08/24 10:54:23 1.56
+++ pkgsrc/lang/ocaml/Makefile.common 2019/11/24 09:23:13 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.56 2019/08/24 10:54:23 jaapb Exp $ 1# $NetBSD: Makefile.common,v 1.57 2019/11/24 09:23:13 adam Exp $
2 2
3# used by x11/labltk/Makefile 3# used by x11/labltk/Makefile
4DISTNAME= ocaml-4.08.1 4DISTNAME= ocaml-4.08.1
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.08/ 6MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.08/
7#EXTRACT_SUFX= .tar.bz2 7#EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= https://ocaml.org/ 10HOMEPAGE= https://ocaml.org/
11COMMENT= The latest implementation of the Caml dialect of ML 11COMMENT= The latest implementation of the Caml dialect of ML
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES+= c99 14USE_LANGUAGES+= c99
@@ -23,34 +23,26 @@ GNU_CONFIGURE= yes @@ -23,34 +23,26 @@ GNU_CONFIGURE= yes
23#CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR} 23#CONFIGURE_ARGS+= -mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
24CONFIGURE_ARGS+= --without-x 24CONFIGURE_ARGS+= --without-x
25#CPPFLAGS+= -DDB_DBM_HSEARCH 25#CPPFLAGS+= -DDB_DBM_HSEARCH
26 26
27#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo 27#DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
28#PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches 28#PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
32.if ${OPSYS} == "Linux" 32.if ${OPSYS} == "Linux"
33INSTALL_UNSTRIPPED= yes 33INSTALL_UNSTRIPPED= yes
34.endif 34.endif
35 35
36#.if ${OPSYS} == "Darwin" 
37#CONFIGURE_ENV+= CC="${CC} -arch ${MACHINE_ARCH} ${CFLAGS}" 
38#CONFIGURE_ENV+= ASPP="${CC} -arch ${MACHINE_ARCH} -c" 
39#CONFIGURE_ENV+= AS="as -arch ${MACHINE_ARCH}" 
40#.else 
41#CONFIGURE_ENV+= CC="${CC} ${CFLAGS}" 
42#.endif 
43 
44.include "../../mk/bdb.buildlink3.mk" 36.include "../../mk/bdb.buildlink3.mk"
45 37
46#BDB_LINK= ${BDB_LIBS} 38#BDB_LINK= ${BDB_LIBS}
47#.if empty(BDBBASE:M/usr) 39#.if empty(BDBBASE:M/usr)
48#BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib 40#BDB_LINK+= -L${BDBBASE}/lib ${COMPILER_RPATH_FLAG}${BDBBASE}/lib
49#.endif 41#.endif
50 42
51#post-extract: cp-gnu-config 43#post-extract: cp-gnu-config
52 44
53#.PHONY: cp-gnu-config 45#.PHONY: cp-gnu-config
54#cp-gnu-config: 46#cp-gnu-config:
55# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/ 47# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
56# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/ 48# ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
cvs diff -r1.132 -r1.133 pkgsrc/lang/ocaml/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/distinfo 2019/10/04 10:33:21 1.132
+++ pkgsrc/lang/ocaml/distinfo 2019/11/24 09:23:13 1.133
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.132 2019/10/04 10:33:21 maya Exp $ 1$NetBSD: distinfo,v 1.133 2019/11/24 09:23:13 adam Exp $
2 2
3SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2 3SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2
4RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6 4RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6
5SHA512 (ocaml-4.08.1.tar.gz) = 8239c1879926e59c3d9611ad0d97618ce21b0528f1bd59db3df9c24287ad180ffa74f34e52e1fab39e71cbf8113a9a4ee5037cc33ae64ca6a9a109fe4ada0256 5SHA512 (ocaml-4.08.1.tar.gz) = 8239c1879926e59c3d9611ad0d97618ce21b0528f1bd59db3df9c24287ad180ffa74f34e52e1fab39e71cbf8113a9a4ee5037cc33ae64ca6a9a109fe4ada0256
6Size (ocaml-4.08.1.tar.gz) = 4897908 bytes 6Size (ocaml-4.08.1.tar.gz) = 4897908 bytes
7SHA1 (patch-Makefile) = 3c1410ba28d7d25ffd8fd4b1ffeef7f0206ec58d 7SHA1 (patch-Makefile) = 3c1410ba28d7d25ffd8fd4b1ffeef7f0206ec58d
8SHA1 (patch-Makefile.common.in) = bc44846bfa941520b43538189dbc5637c342ef0a 8SHA1 (patch-Makefile.common.in) = bc44846bfa941520b43538189dbc5637c342ef0a
9SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851 9SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851
10SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f 10SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
11SHA1 (patch-asmrun_amd64.S) = 68d8f3ba1c1ad951e688539b4659aee71a527222 11SHA1 (patch-asmrun_amd64.S) = 68d8f3ba1c1ad951e688539b4659aee71a527222
12SHA1 (patch-configure) = 28243f1cf36cd26281e620617d2fe1937fd59372 12SHA1 (patch-configure) = c2c03a3e6706b71f12b16f28c751ca3a0e4d4dd5
13SHA1 (patch-driver_compenv.ml) = 27c68072bd73c9c00d2b3093d8c6498f192ca3d3 13SHA1 (patch-driver_compenv.ml) = 27c68072bd73c9c00d2b3093d8c6498f192ca3d3
14SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991 14SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
15SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04 15SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
16SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863 16SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863
17SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3 17SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
18SHA1 (patch-lex_Makefile) = 9c3de0a77dbea117b5587cfd77bbdcb3e2db26b6 18SHA1 (patch-lex_Makefile) = 9c3de0a77dbea117b5587cfd77bbdcb3e2db26b6
19SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22 19SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
20SHA1 (patch-ocamldoc_Makefile) = 7f0a90ca7849447b93ae4b3fcbc58901de1e996f 20SHA1 (patch-ocamldoc_Makefile) = 7f0a90ca7849447b93ae4b3fcbc58901de1e996f
21SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b 21SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
22SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 2eb71de7bd659c763fb7efdf10af1812e135c904 22SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 2eb71de7bd659c763fb7efdf10af1812e135c904
23SHA1 (patch-otherlibs_systhreads_Makefile) = d6f7818487c156b101b6a78f0dc2824d57453e50 23SHA1 (patch-otherlibs_systhreads_Makefile) = d6f7818487c156b101b6a78f0dc2824d57453e50
24SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 99fd5e74e1e885b5288419a3499463d252b1b5f4 24SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 99fd5e74e1e885b5288419a3499463d252b1b5f4
25SHA1 (patch-otherlibs_threads_Makefile) = 3ccc89021d808967bc958d295515ceca1c39c81d 25SHA1 (patch-otherlibs_threads_Makefile) = 3ccc89021d808967bc958d295515ceca1c39c81d
cvs diff -r1.2 -r1.3 pkgsrc/lang/ocaml/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/options.mk 2019/08/24 10:54:23 1.2
+++ pkgsrc/lang/ocaml/options.mk 2019/11/24 09:23:13 1.3
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: options.mk,v 1.2 2019/08/24 10:54:23 jaapb Exp $ 1# $NetBSD: options.mk,v 1.3 2019/11/24 09:23:13 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml 3PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml
4PKG_SUPPORTED_OPTIONS= pic flambda spacetime 4PKG_SUPPORTED_OPTIONS= pic flambda spacetime
5PKG_SUGGESTED_OPTIONS= pic 5PKG_SUGGESTED_OPTIONS= pic
6 6
7.include "../../mk/bsd.prefs.mk" 
8.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
9 8
10.if !empty(PKG_OPTIONS:Mpic) 9.if !empty(PKG_OPTIONS:Mpic)
11CONFIGURE_ARGS+= --with-pic 10CONFIGURE_ARGS+= --with-pic
12.else 11.else
13CONFIGURE_ARGS+= --without-pic 12CONFIGURE_ARGS+= --without-pic
14.endif 13.endif
15 14
16.if !empty(PKG_OPTIONS:Mflambda) 15.if !empty(PKG_OPTIONS:Mflambda)
17CONFIGURE_ARGS+= --enable-flambda 16CONFIGURE_ARGS+= --enable-flambda
18.else 17.else
19CONFIGURE_ARGS+= --disable-flambda 18CONFIGURE_ARGS+= --disable-flambda
20.endif 19.endif
cvs diff -r1.39 -r1.40 pkgsrc/lang/ocaml/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/patches/patch-configure 2019/10/04 10:33:21 1.39
+++ pkgsrc/lang/ocaml/patches/patch-configure 2019/11/24 09:23:13 1.40
@@ -1,108 +1,108 @@ @@ -1,108 +1,108 @@
1$NetBSD: patch-configure,v 1.39 2019/10/04 10:33:21 maya Exp $ 1$NetBSD: patch-configure,v 1.40 2019/11/24 09:23:13 adam Exp $
2 2
3All kinds of OS-specific changes to configure 3All kinds of OS-specific changes to configure
4Honor LDFLAGS. 4Honor LDFLAGS.
5 5
6Add SunOS -lnsl -lsocket 6Add SunOS -lnsl -lsocket
7Recognise SunOS/amd64 as amd64 7Recognise SunOS/amd64 as amd64
8Recognise SunOS as having shared libraries 8Recognise SunOS as having shared libraries
9 9
10--- configure.orig 2019-08-05 17:32:44.000000000 +0000 10--- configure.orig 2019-08-05 17:32:44.000000000 +0000
11+++ configure 11+++ configure
12@@ -13311,7 +13311,7 @@ sharedlib_cflags='' 12@@ -13311,7 +13317,7 @@ sharedlib_cflags=''
13 mksharedlib='shared-libs-not-available' 13 mksharedlib='shared-libs-not-available'
14 rpath='' 14 rpath=''
15 mksharedlibrpath='' 15 mksharedlibrpath=''
16-natdynlinkopts="" 16-natdynlinkopts=""
17+natdynlinkopts="-L/usr/lib -R/usr/lib -R/usr/pkg/lib" 17+natdynlinkopts="-L/usr/lib -R/usr/lib -R$(PREFIX)/lib"
18  18
19 if test x"$enable_shared" != "xno"; then : 19 if test x"$enable_shared" != "xno"; then :
20 case $host in #( 20 case $host in #(
21@@ -13347,9 +13347,14 @@ esac ;; #( 21@@ -13347,9 +13353,14 @@ esac ;; #(
22 rpath="-Wl,-rpath," 22 rpath="-Wl,-rpath,"
23 mksharedlibrpath="-Wl,-rpath," 23 mksharedlibrpath="-Wl,-rpath,"
24 natdynlinkopts="-Wl,-E" 24 natdynlinkopts="-Wl,-E"
25- shared_libraries_supported=true ;; #( 25- shared_libraries_supported=true ;; #(
26+ shared_libraries_supported=true 26+ shared_libraries_supported=true
27+ *-*-solaris* ;; #( 27+ *-*-solaris* ;; #(
28 *) : 28 *) :
29- ;; 29- ;;
30+ sharedlib_cflags="-fPIC" 30+ sharedlib_cflags="-fPIC"
31+ mksharedlib="$CC -shared" 31+ mksharedlib="$CC -shared"
32+ rpath="-Wl,-rpath," 32+ rpath="-Wl,-rpath,"
33+ mksharedlibrpath="-Wl,-rpath," 33+ mksharedlibrpath="-Wl,-rpath,"
34+ shared_libraries_supported=true ;; 34+ shared_libraries_supported=true ;;
35 esac 35 esac
36 fi 36 fi
37  37
38@@ -13403,6 +13408,8 @@ fi ;; #( 38@@ -13403,6 +13414,8 @@ fi ;; #(
39 natdynlink=true ;; #( 39 natdynlink=true ;; #(
40 x86_64-*-netbsd*) : 40 x86_64-*-netbsd*) :
41 natdynlink=true ;; #( 41 natdynlink=true ;; #(
42+ x86_64-*-solaris*) : 42+ x86_64-*-solaris*) :
43+ natdynlink=true ;; #( 43+ natdynlink=true ;; #(
44 i386-*-gnu0.3) : 44 i386-*-gnu0.3) :
45 natdynlink=true ;; #( 45 natdynlink=true ;; #(
46 i[3456]86-*-haiku*) : 46 i[3456]86-*-haiku*) :
47@@ -13415,6 +13422,8 @@ fi ;; #( 47@@ -13415,6 +13428,8 @@ fi ;; #(
48 natdynlink=true ;; #( 48 natdynlink=true ;; #(
49 aarch64-*-linux*) : 49 aarch64-*-linux*) :
50 natdynlink=true ;; #( 50 natdynlink=true ;; #(
51+ aarch64-*-netbsd*) : 51+ aarch64-*-netbsd*) :
52+ natdynlink=true ;; #( 52+ natdynlink=true ;; #(
53 *) : 53 *) :
54 ;; 54 ;;
55 esac 55 esac
56@@ -13466,6 +13475,8 @@ case $host in #( 56@@ -13466,6 +13481,8 @@ case $host in #(
57 arch=i386; system=beos ;; #( 57 arch=i386; system=beos ;; #(
58 i[3456]86-*-cygwin) : 58 i[3456]86-*-cygwin) :
59 arch=i386; system=cygwin ;; #( 59 arch=i386; system=cygwin ;; #(
60+ i[3456]86-*-interix3) : 60+ i[3456]86-*-interix3) :
61+ arch=i386; system=interix3 ;; #( 61+ arch=i386; system=interix3 ;; #(
62 i[3456]86-*-darwin*) : 62 i[3456]86-*-darwin*) :
63 if $arch64; then : 63 if $arch64; then :
64 arch=amd64 64 arch=amd64
65@@ -13510,6 +13521,10 @@ fi; system=elf ;; #( 65@@ -13510,6 +13527,10 @@ fi; system=elf ;; #(
66 arch=arm; model=armv6; system=linux_eabi ;; #( 66 arch=arm; model=armv6; system=linux_eabi ;; #(
67 armv6*-*-freebsd*) : 67 armv6*-*-freebsd*) :
68 arch=arm; model=armv6; system=freebsd ;; #( 68 arch=arm; model=armv6; system=freebsd ;; #(
69+ armv6*-*-netbsd*) : 69+ armv6*-*-netbsd*) :
70+ arch=arm; model=armv6; system=netbsd ;; #( 70+ arch=arm; model=armv6; system=netbsd ;; #(
71+ armv7*-*-netbsd*) : 71+ armv7*-*-netbsd*) :
72+ arch=arm; model=armv7; system=netbsd ;; #( 72+ arch=arm; model=armv7; system=netbsd ;; #(
73 earmv6*-*-netbsd*) : 73 earmv6*-*-netbsd*) :
74 arch=arm; model=armv6; system=netbsd ;; #( 74 arch=arm; model=armv6; system=netbsd ;; #(
75 earmv7*-*-netbsd*) : 75 earmv7*-*-netbsd*) :
76@@ -13544,8 +13559,12 @@ fi; system=elf ;; #( 76@@ -13544,8 +13565,12 @@ fi; system=elf ;; #(
77 arch=amd64; system=mingw64 ;; #( 77 arch=amd64; system=mingw64 ;; #(
78 aarch64-*-linux*) : 78 aarch64-*-linux*) :
79 arch=arm64; system=linux ;; #( 79 arch=arm64; system=linux ;; #(
80+ aarch64-*-netbsd*) : 80+ aarch64-*-netbsd*) :
81+ arch=arm64; system=netbsd ;; #( 81+ arch=arm64; system=netbsd ;; #(
82 x86_64-*-cygwin*) : 82 x86_64-*-cygwin*) :
83- arch=amd64; system=cygwin 83- arch=amd64; system=cygwin
84+ arch=amd64; system=cygwin ;; #( 84+ arch=amd64; system=cygwin ;; #(
85+ x86_64-*-solaris*) : 85+ x86_64-*-solaris*) :
86+ arch=amd64; system=solaris 86+ arch=amd64; system=solaris
87 ;; #( 87 ;; #(
88 *) : 88 *) :
89 ;; 89 ;;
90@@ -13884,7 +13903,7 @@ fi 90@@ -13884,7 +13909,7 @@ fi
91 # for the moment, to be backward-compatible 91 # for the moment, to be backward-compatible
92  92
93 case $host in #( 93 case $host in #(
94- *-*-mingw32|*-pc-windows) : 94- *-*-mingw32|*-pc-windows) :
95+ *-*-mingw32|*-pc-windows|*-*-netbsd*) : 95+ *-*-mingw32|*-pc-windows|*-*-netbsd*) :
96 ;; #( 96 ;; #(
97 *) : 97 *) :
98 has_c99_float_ops=true 98 has_c99_float_ops=true
99@@ -14085,6 +14104,9 @@ case $host in #( 99@@ -14085,6 +14110,9 @@ case $host in #(
100 *-*-mingw32|*-pc-windows) : 100 *-*-mingw32|*-pc-windows) :
101 cclibs="$cclibs -lws2_32" 101 cclibs="$cclibs -lws2_32"
102 sockets=true ;; #( 102 sockets=true ;; #(
103+ *-*-solaris*) : 103+ *-*-solaris*) :
104+ cclibs="$cclibs -lnsl -lsocket" 104+ cclibs="$cclibs -lnsl -lsocket"
105+ sockets=true ;; #( 105+ sockets=true ;; #(
106 *) : 106 *) :
107  107
108 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" 108 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"