Fri Feb 1 12:36:06 2013 UTC ()
Prefer openssl from pkgsrc on SunOS by default.


(hans)
diff -r1.47 -r1.48 pkgsrc/mk/platform/SunOS.mk
cvs diff -r1.47 -r1.48 pkgsrc/mk/platform/SunOS.mk (switch to unified diff)

--- pkgsrc/mk/platform/SunOS.mk 2013/02/01 12:25:16 1.47
+++ pkgsrc/mk/platform/SunOS.mk 2013/02/01 12:36:06 1.48
@@ -1,87 +1,88 @@ @@ -1,87 +1,88 @@
1# $NetBSD: SunOS.mk,v 1.47 2013/02/01 12:25:16 hans Exp $ 1# $NetBSD: SunOS.mk,v 1.48 2013/02/01 12:36:06 hans Exp $
2# 2#
3# Variable definitions for the SunOS/Solaris operating system. 3# Variable definitions for the SunOS/Solaris operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 6IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
7PKGLOCALEDIR?= lib 7PKGLOCALEDIR?= lib
8PS?= /bin/ps 8PS?= /bin/ps
9# XXX: default from defaults/mk.conf. Verify/correct for this platform 9# XXX: default from defaults/mk.conf. Verify/correct for this platform
10# and remove this comment. 10# and remove this comment.
11SU?= /usr/bin/su 11SU?= /usr/bin/su
12TYPE?= /usr/bin/type 12TYPE?= /usr/bin/type
13 13
14CPP_PRECOMP_FLAGS?= # unset 14CPP_PRECOMP_FLAGS?= # unset
15DEF_UMASK?= 022 15DEF_UMASK?= 022
16DEFAULT_SERIAL_DEVICE?= /dev/null 16DEFAULT_SERIAL_DEVICE?= /dev/null
17EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 17EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
18GROUPADD?= /usr/sbin/groupadd 18GROUPADD?= /usr/sbin/groupadd
19NOLOGIN?= /usr/bin/false 19NOLOGIN?= /usr/bin/false
20ROOT_CMD?= ${SU} - root -c 20ROOT_CMD?= ${SU} - root -c
21ROOT_GROUP?= root 21ROOT_GROUP?= root
22ROOT_USER?= root 22ROOT_USER?= root
23SERIAL_DEVICES?= /dev/null 23SERIAL_DEVICES?= /dev/null
24ULIMIT_CMD_datasize?= ulimit -d `${SETENV} LC_MESSAGES=C ulimit -H -d` 24ULIMIT_CMD_datasize?= ulimit -d `${SETENV} LC_MESSAGES=C ulimit -H -d`
25ULIMIT_CMD_stacksize?= ulimit -s `${SETENV} LC_MESSAGES=C ulimit -H -s` 25ULIMIT_CMD_stacksize?= ulimit -s `${SETENV} LC_MESSAGES=C ulimit -H -s`
26ULIMIT_CMD_memorysize?= ulimit -v `${SETENV} LC_MESSAGES=C ulimit -H -v` 26ULIMIT_CMD_memorysize?= ulimit -v `${SETENV} LC_MESSAGES=C ulimit -H -v`
27USERADD?= /usr/sbin/useradd 27USERADD?= /usr/sbin/useradd
28 28
29.if exists(/usr/openwin/include/X11/X.h) 29.if exists(/usr/openwin/include/X11/X.h)
30X11_TYPE?= native 30X11_TYPE?= native
31.else 31.else
32X11_TYPE?= modular 32X11_TYPE?= modular
33.endif 33.endif
34.if ${X11_TYPE} == native 34.if ${X11_TYPE} == native
35MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type 35MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
36.else 36.else
37MOTIF_TYPE_DEFAULT?= motif 37MOTIF_TYPE_DEFAULT?= motif
38.endif 38.endif
39 39
40# Builtin defaults which make sense for this platform. 40# Builtin defaults which make sense for this platform.
41PREFER.solaris-pam?= native 41PREFER.solaris-pam?= native
 42PREFER.openssl?= pkgsrc
42 43
43_OPSYS_EMULDIR.solaris= # empty 44_OPSYS_EMULDIR.solaris= # empty
44_OPSYS_EMULDIR.solaris32= # empty 45_OPSYS_EMULDIR.solaris32= # empty
45_OPSYS_EMULDIR.sunos= # empty 46_OPSYS_EMULDIR.sunos= # empty
46 47
47.if exists(/usr/include/netinet/ip6.h) 48.if exists(/usr/include/netinet/ip6.h)
48_OPSYS_HAS_INET6= yes # IPv6 is standard 49_OPSYS_HAS_INET6= yes # IPv6 is standard
49.else 50.else
50_OPSYS_HAS_INET6= no # IPv6 is not standard 51_OPSYS_HAS_INET6= no # IPv6 is not standard
51.endif 52.endif
52_OPSYS_HAS_JAVA= no # Java is not standard 53_OPSYS_HAS_JAVA= no # Java is not standard
53_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages 54_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
54_OPSYS_HAS_OSSAUDIO= no # libossaudio is available 55_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
55_OPSYS_PERL_REQD= # no base version of perl required 56_OPSYS_PERL_REQD= # no base version of perl required
56_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads 57_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
57_OPSYS_SHLIB_TYPE= ELF # shared lib type 58_OPSYS_SHLIB_TYPE= ELF # shared lib type
58_OPSYS_MISSING_FEATURES=asprintf 59_OPSYS_MISSING_FEATURES=asprintf
59_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 60_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
60_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix 61_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
61_USE_RPATH= yes # add rpath to LDFLAGS 62_USE_RPATH= yes # add rpath to LDFLAGS
62 63
63# flags passed to the linker to extract all symbols from static archives. 64# flags passed to the linker to extract all symbols from static archives.
64# this is the standard Solaris linker, /usr/ccs/bin/ld. The use of GNU 65# this is the standard Solaris linker, /usr/ccs/bin/ld. The use of GNU
65# ld is not currently supported. 66# ld is not currently supported.
66_OPSYS_WHOLE_ARCHIVE_FLAG= -z allextract 67_OPSYS_WHOLE_ARCHIVE_FLAG= -z allextract
67_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -z defaultextract 68_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -z defaultextract
68 69
69# Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it 70# Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it
70# incompatible. 71# incompatible.
71_INCOMPAT_ICONV= SunOS-*-* 72_INCOMPAT_ICONV= SunOS-*-*
72 73
73_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip 74_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
74_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip 75_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
75 76
76PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 77PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
77 78
78.if (${MACHINE_ARCH} == "x86_64") 79.if (${MACHINE_ARCH} == "x86_64")
79LIBABISUFFIX= /amd64 80LIBABISUFFIX= /amd64
80.endif 81.endif
81 82
82_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk 83_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk
83 84
84# check for maximum command line length and set it in configure's environment, 85# check for maximum command line length and set it in configure's environment,
85# to avoid a test required by the libtool script that takes forever. 86# to avoid a test required by the libtool script that takes forever.
86# FIXME: Adjust to work on this system and enable the lines below. 87# FIXME: Adjust to work on this system and enable the lines below.
87#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax 88#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax