Wed Feb 19 17:20:23 2014 UTC ()
Use the _OPSYS_PREFER mechanism rather than LIBC_BUILTINS.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/mk/platform/GNUkFreeBSD.mk
diff -r1.56 -r1.57 pkgsrc/mk/platform/Linux.mk
cvs diff -r1.1 -r1.2 pkgsrc/mk/platform/GNUkFreeBSD.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/GNUkFreeBSD.mk 2013/07/26 09:38:15 1.1
+++ pkgsrc/mk/platform/GNUkFreeBSD.mk 2014/02/19 17:20:23 1.2
@@ -1,56 +1,61 @@ @@ -1,56 +1,61 @@
1# $NetBSD: GNUkFreeBSD.mk,v 1.1 2013/07/26 09:38:15 ryoon Exp $ 1# $NetBSD: GNUkFreeBSD.mk,v 1.2 2014/02/19 17:20:23 jperkin Exp $
2# 2#
3# Variable definitions for the Debian GNU/kFreeBSD operating system. 3# Variable definitions for the Debian GNU/kFreeBSD operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if defined(X11_TYPE) && ${X11_TYPE} == "native" 6.if defined(X11_TYPE) && ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
8IMAKE_TOOLS= gmake # extra tools required when we use imake 8IMAKE_TOOLS= gmake # extra tools required when we use imake
9.endif 9.endif
10IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12PS?= /bin/ps 12PS?= /bin/ps
13SU?= /bin/su 13SU?= /bin/su
14TYPE?= type # Shell builtin 14TYPE?= type # Shell builtin
15 15
16CPP_PRECOMP_FLAGS?= # unset 16CPP_PRECOMP_FLAGS?= # unset
17DEF_UMASK?= 022 17DEF_UMASK?= 022
18DEFAULT_SERIAL_DEVICE?= /dev/null 18DEFAULT_SERIAL_DEVICE?= /dev/null
19EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 19EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
20GROUPADD?= /usr/sbin/groupadd 20GROUPADD?= /usr/sbin/groupadd
21LIBC_BUILTINS= iconv getopt sysexits gettext 
22MOTIF_TYPE_DEFAULT?= motif # default 2.0 compatible libs type 21MOTIF_TYPE_DEFAULT?= motif # default 2.0 compatible libs type
23NOLOGIN?= /usr/sbin/nologin 22NOLOGIN?= /usr/sbin/nologin
24PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 23PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
25ROOT_CMD?= ${SU} - root -c 24ROOT_CMD?= ${SU} - root -c
26ROOT_GROUP?= root 25ROOT_GROUP?= root
27ROOT_USER?= root 26ROOT_USER?= root
28SERIAL_DEVICES?= /dev/null 27SERIAL_DEVICES?= /dev/null
29ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` 28ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
30ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` 29ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
31ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m` 30ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
32USERADD?= /usr/sbin/useradd 31USERADD?= /usr/sbin/useradd
33 32
34.if !empty(MACHINE_ARCH:Mx86_64) 33.if !empty(MACHINE_ARCH:Mx86_64)
35_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib/x86_64-kfreebsd-gnu:/usr/lib/x86_64-kfreebsd-gnu 34_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib/x86_64-kfreebsd-gnu:/usr/lib/x86_64-kfreebsd-gnu
36_OPSYS_LIB_DIRS?= /lib /usr/lib /lib/x86_64-kfreebsd-gnu /usr/lib/x86_64-kfreebsd-gnu 35_OPSYS_LIB_DIRS?= /lib /usr/lib /lib/x86_64-kfreebsd-gnu /usr/lib/x86_64-kfreebsd-gnu
37.endif 36.endif
38.if !empty(MACHINE_ARCH:Mi386) 37.if !empty(MACHINE_ARCH:Mi386)
39_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib/i386-kfreebsd-gnu:/usr/lib/i386-kfreebsd-gnu 38_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib/i386-kfreebsd-gnu:/usr/lib/i386-kfreebsd-gnu
40_OPSYS_LIB_DIRS?= /lib /usr/lib /lib/i386-kfreebsd-gnu /usr/lib/i386-kfreebsd-gnu 39_OPSYS_LIB_DIRS?= /lib /usr/lib /lib/i386-kfreebsd-gnu /usr/lib/i386-kfreebsd-gnu
41.endif 40.endif
42_OPSYS_INCLUDE_DIRS?= /usr/include 41_OPSYS_INCLUDE_DIRS?= /usr/include
43 42
 43# These are libc builtins
 44_OPSYS_PREFER.getopt?= native
 45_OPSYS_PREFER.gettext?= native
 46_OPSYS_PREFER.iconv?= native
 47_OPSYS_PREFER.sysexits?= native
 48
44_OPSYS_HAS_INET6= yes # IPv6 is standard 49_OPSYS_HAS_INET6= yes # IPv6 is standard
45_OPSYS_HAS_JAVA= no # Java is not standard 50_OPSYS_HAS_JAVA= no # Java is not standard
46_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages 51_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
47_OPSYS_HAS_OSSAUDIO= no # libossaudio is unavailable 52_OPSYS_HAS_OSSAUDIO= no # libossaudio is unavailable
48_OPSYS_PERL_REQD= # no base version of perl required 53_OPSYS_PERL_REQD= # no base version of perl required
49_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads 54_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
50_OPSYS_SHLIB_TYPE= ELF # shared lib type 55_OPSYS_SHLIB_TYPE= ELF # shared lib type
51_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 56_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
52_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix 57_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
53_USE_RPATH= yes # add rpath to LDFLAGS 58_USE_RPATH= yes # add rpath to LDFLAGS
54 59
55# flags passed to the linker to extract all symbols from static archives. 60# flags passed to the linker to extract all symbols from static archives.
56# this is GNU ld. 61# this is GNU ld.
cvs diff -r1.56 -r1.57 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2013/07/23 13:01:05 1.56
+++ pkgsrc/mk/platform/Linux.mk 2014/02/19 17:20:23 1.57
@@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
1# $NetBSD: Linux.mk,v 1.56 2013/07/23 13:01:05 ryoon Exp $ 1# $NetBSD: Linux.mk,v 1.57 2014/02/19 17:20:23 jperkin Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if defined(X11_TYPE) && ${X11_TYPE} == "native" 6.if defined(X11_TYPE) && ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
8IMAKE_TOOLS= gmake # extra tools required when we use imake 8IMAKE_TOOLS= gmake # extra tools required when we use imake
9.endif 9.endif
10IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12PS?= /bin/ps 12PS?= /bin/ps
13# XXX: default from defaults/mk.conf. Verify/correct for this platform 13# XXX: default from defaults/mk.conf. Verify/correct for this platform
14# and remove this comment. 14# and remove this comment.
15.if exists(/usr/bin/su) 15.if exists(/usr/bin/su)
16SU?= /usr/bin/su 16SU?= /usr/bin/su
17.else 17.else
18SU?= /bin/su 18SU?= /bin/su
19.endif 19.endif
20TYPE?= type # Shell builtin 20TYPE?= type # Shell builtin
21 21
22CPP_PRECOMP_FLAGS?= # unset 22CPP_PRECOMP_FLAGS?= # unset
23DEF_UMASK?= 022 23DEF_UMASK?= 022
24DEFAULT_SERIAL_DEVICE?= /dev/null 24DEFAULT_SERIAL_DEVICE?= /dev/null
25EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table 25EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
26GROUPADD?= /usr/sbin/groupadd 26GROUPADD?= /usr/sbin/groupadd
27LIBC_BUILTINS= iconv getopt sysexits gettext 
28MOTIF_TYPE_DEFAULT?= motif # default 2.0 compatible libs type 27MOTIF_TYPE_DEFAULT?= motif # default 2.0 compatible libs type
29.if exists(/etc/ssdlinux_version) 28.if exists(/etc/ssdlinux_version)
30NOLOGIN?= /sbin/nologin 29NOLOGIN?= /sbin/nologin
31.else 30.else
32NOLOGIN?= /bin/false 31NOLOGIN?= /bin/false
33.endif 32.endif
34PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 33PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
35ROOT_CMD?= ${SU} - root -c 34ROOT_CMD?= ${SU} - root -c
36.if exists(/etc/ssdlinux_version) 35.if exists(/etc/ssdlinux_version)
37ROOT_GROUP?= wheel 36ROOT_GROUP?= wheel
38.else 37.else
39ROOT_GROUP?= root 38ROOT_GROUP?= root
40.endif 39.endif
@@ -58,26 +57,32 @@ _OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /u @@ -58,26 +57,32 @@ _OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /u
58_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu 57_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu
59_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/i386-linux-gnu /usr/lib/i386-linux-gnu 58_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/i386-linux-gnu /usr/lib/i386-linux-gnu
60.endif 59.endif
61.if !empty(MACHINE_ARCH:Marm*) 60.if !empty(MACHINE_ARCH:Marm*)
62_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-gnueabi:/usr/lib/arm-linux-gnueabi 61_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-gnueabi:/usr/lib/arm-linux-gnueabi
63_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabi /usr/lib/arm-linux-gnueabi 62_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabi /usr/lib/arm-linux-gnueabi
64.endif 63.endif
65.else 64.else
66_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX} 65_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
67_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} 66_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
68.endif 67.endif
69_OPSYS_INCLUDE_DIRS?= /usr/include 68_OPSYS_INCLUDE_DIRS?= /usr/include
70 69
 70# These are libc builtins
 71_OPSYS_PREFER.getopt?= native
 72_OPSYS_PREFER.gettext?= native
 73_OPSYS_PREFER.iconv?= native
 74_OPSYS_PREFER.sysexits?= native
 75
71.if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h) 76.if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
72_OPSYS_HAS_INET6= yes # IPv6 is standard 77_OPSYS_HAS_INET6= yes # IPv6 is standard
73.else 78.else
74_OPSYS_HAS_INET6= no # IPv6 is not standard 79_OPSYS_HAS_INET6= no # IPv6 is not standard
75.endif 80.endif
76_OPSYS_HAS_JAVA= no # Java is not standard 81_OPSYS_HAS_JAVA= no # Java is not standard
77_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages 82_OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages
78_OPSYS_HAS_OSSAUDIO= no # libossaudio is unavailable 83_OPSYS_HAS_OSSAUDIO= no # libossaudio is unavailable
79_OPSYS_PERL_REQD= # no base version of perl required 84_OPSYS_PERL_REQD= # no base version of perl required
80_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads 85_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
81_OPSYS_SHLIB_TYPE= ELF # shared lib type 86_OPSYS_SHLIB_TYPE= ELF # shared lib type
82_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 87_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
83_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix 88_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix