pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/platform Factored out the parts that are common bet...
details: https://anonhg.NetBSD.org/pkgsrc/rev/54c6794151cc
branches: trunk
changeset: 534379:54c6794151cc
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu Oct 18 21:52:23 2007 +0000
description:
Factored out the parts that are common between all the supported
platforms, mainly because it wouldn't have made sense to document the
variables in one of those files, but they need to be documented
somewhere.
Added the file defaults.mk, which now serves as the reference document
which provides useful default values and _explains_ the variables.
diffstat:
mk/platform/AIX.mk | 10 +--
mk/platform/BSDOS.mk | 10 +--
mk/platform/Darwin.mk | 10 +--
mk/platform/DragonFly.mk | 12 +---
mk/platform/FreeBSD.mk | 12 +---
mk/platform/HPUX.mk | 17 ++---
mk/platform/IRIX.mk | 10 +--
mk/platform/Interix.mk | 9 +--
mk/platform/Linux.mk | 17 ++---
mk/platform/NetBSD.mk | 18 +----
mk/platform/OSF1.mk | 12 +---
mk/platform/OpenBSD.mk | 15 +----
mk/platform/SunOS.mk | 15 ++--
mk/platform/UnixWare.mk | 9 +--
mk/platform/defaults.mk | 133 +++++++++++++++++++++++++++++++++++++++++++++++
15 files changed, 189 insertions(+), 120 deletions(-)
diffs (truncated from 760 to 300 lines):
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/AIX.mk
--- a/mk/platform/AIX.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/AIX.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.27 2007/10/09 20:39:39 rillig Exp $
+# $NetBSD: AIX.mk,v 1.28 2007/10/18 21:52:23 rillig Exp $
#
# Variable definitions for the AIX operating system.
@@ -16,18 +16,12 @@
SU?= /usr/bin/su
TYPE?= type # Shell builtin
-CPP_PRECOMP_FLAGS?= # unset
-DEF_UMASK?= 0022
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
NOLOGIN?= /sbin/nologin
-PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
ROOT_USER?= root
ROOT_GROUP?= system
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
# imake installs manpages in weird places
# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
@@ -86,3 +80,5 @@
#GAMEMODE= 2555
#GAMEDIRMODE= 0775
#.endif
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/BSDOS.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.21 2007/07/02 14:03:35 joerg Exp $
+# $NetBSD: BSDOS.mk,v 1.22 2007/10/18 21:52:23 rillig Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -17,8 +17,6 @@
# sh doesn't have built-in type
TYPE?= which
-CPP_PRECOMP_FLAGS?= # unset
-DEF_UMASK?= 0022
.if ${OBJECT_FMT} == "ELF"
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
.else
@@ -26,13 +24,9 @@
.endif
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
NOLOGIN?= /sbin/nologin
-PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
ROOT_USER?= root
ROOT_GROUP?= wheel
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
# imake installs manpages in weird places
# XXX: assume NetBSD defaults until somebody determines correct values
@@ -94,3 +88,5 @@
#GAMEMODE= 2555
#GAMEDIRMODE= 0775
#.endif
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/Darwin.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.24 2007/07/29 05:19:44 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.25 2007/10/18 21:52:23 rillig Exp $
#
# Variable definitions for the Darwin operating system.
@@ -7,7 +7,6 @@
.endif
ECHO_N?= ${ECHO} -n
LDD?= /usr/bin/otool -L
-IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
PKGLOCALEDIR?= share
PS?= /bin/ps
# XXX: default from defaults/mk.conf. Verify/correct for this platform
@@ -22,19 +21,14 @@
.if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
CPP_PRECOMP_FLAGS?= -no-cpp-precomp # use the GNU cpp, not the OS X cpp
.endif
-DEF_UMASK?= 0022
DEFAULT_SERIAL_DEVICE?= /dev/null
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
NOLOGIN?= /usr/bin/false
-PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= /usr/bin/sudo ${SH} -c
ROOT_GROUP?= wheel
ROOT_USER?= root
SERIAL_DEVICES?= /dev/null
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
GROUPADD?= ${LOCALBASE}/sbin/groupadd
USERADD?= ${LOCALBASE}/sbin/useradd
@@ -106,3 +100,5 @@
#GAMEMODE= 2555
#GAMEDIRMODE= 0775
#.endif
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/DragonFly.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,28 +1,20 @@
-# $NetBSD: DragonFly.mk,v 1.32 2007/07/29 05:19:44 jlam Exp $
+# $NetBSD: DragonFly.mk,v 1.33 2007/10/18 21:52:23 rillig Exp $
#
# Variable definitions for the DragonFly operating system.
ECHO_N?= ${ECHO} -n
-IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
IMAKEOPTS+= -DBuildHtmlManPages=NO
-PKGLOCALEDIR?= share
PS?= /bin/ps
PW?= /usr/sbin/pw
SU?= /usr/bin/su
TYPE?= type # Shell builtin
-CPP_PRECOMP_FLAGS?= # unset
-DEF_UMASK?= 0022
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
NOLOGIN?= /sbin/nologin
-PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
ROOT_USER?= root
ROOT_GROUP?= wheel
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
# DragonFly does not provide an X11, so default to modular X.org
X11_TYPE?= modular
@@ -92,3 +84,5 @@
GAMEMODE= 2555
GAMEDIRMODE= 0775
.endif
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/FreeBSD.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,19 +1,15 @@
-# $NetBSD: FreeBSD.mk,v 1.21 2007/07/29 05:19:44 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.22 2007/10/18 21:52:23 rillig Exp $
#
# Variable definitions for the FreeBSD operating system.
BRANDELF?= /usr/bin/brandelf # used by linux compat layer
ECHO_N?= ${ECHO} -n
-IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
IMAKEOPTS+= -DBuildHtmlManPages=NO
-PKGLOCALEDIR?= share
PS?= /bin/ps
PW?= /usr/sbin/pw
SU?= /usr/bin/su
TYPE?= type # Shell builtin
-CPP_PRECOMP_FLAGS?= # unset
-DEF_UMASK?= 0022
.if ${OBJECT_FMT} == "ELF"
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
.else
@@ -21,13 +17,9 @@
.endif
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
NOLOGIN?= /sbin/nologin
-PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
ROOT_USER?= root
ROOT_GROUP?= wheel
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
# imake installs manpages in weird places
IMAKE_MAN_SOURCE_PATH= man/man
@@ -94,3 +86,5 @@
GAMEMODE= 2555
GAMEDIRMODE= 0775
.endif
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/HPUX.mk
--- a/mk/platform/HPUX.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/HPUX.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: HPUX.mk,v 1.8 2007/10/16 12:11:25 tnn Exp $
+# $NetBSD: HPUX.mk,v 1.9 2007/10/18 21:52:23 rillig Exp $
#
# Variable definitions for the HP-UX operating system.
CPP?= /opt/langtools/lbin/cpp
ECHO_N?= /usr/bin/printf # echo doesn't understand -n
-IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
-PKGLOCALEDIR?= share
PS?= /bin/ps
SU?= /usr/bin/su
TYPE?= type # Shell builtin
@@ -13,19 +11,14 @@
USERADD?= /usr/sbin/useradd
GROUPADD?= /usr/sbin/groupadd
-CPP_PRECOMP_FLAGS?= # unset
-DEF_UMASK?= 0022
EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= openmotif # default 2.0 compatible libs type
NOLOGIN?= /etc/nologin
-PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
ROOT_CMD?= ${SU} - root -c
ROOT_USER?= root
ROOT_GROUP?= sys
TOUCH_FLAGS?= # touch doesn't understand -f
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
+
# imake installs manpages in weird places
# these values from /usr/X11R6/lib/X11/config/NetBSD.cf
IMAKE_MAN_SOURCE_PATH= man/cat
@@ -78,5 +71,7 @@
PREFER.openssl?= pkgsrc
PREFER.zlib?= pkgsrc
-_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U} # cc(1) option to strip
-_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U} # install(1) option to strip
+_STRIPFLAG_CC?= # none; XXX: why?
+_STRIPFLAG_INSTALL?= # none; XXX: why?
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/IRIX.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: IRIX.mk,v 1.30 2007/07/29 05:19:44 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.31 2007/10/18 21:52:24 rillig Exp $
#
# Variable definitions for the IRIX operating system.
ECHO_N?= ${ECHO} -n
-IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
IMAKEOPTS+= -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
IMAKEOPTS+= -DManUsr=${PREFIX}
.if empty(OS_VERSION:M6*)
@@ -11,13 +10,10 @@
IMAKEOPTS+= -DOptimizerLevel="${CFLAGS}"
IMAKEOPTS+= -DManPath=${PREFIX}/man
.endif
-PKGLOCALEDIR?= share
PS?= /sbin/ps
SU?= /sbin/su
TYPE?= /sbin/type
-CPP_PRECOMP_FLAGS?= # unset
-DEF_UMASK?= 022
DEFAULT_SERIAL_DEVICE?= /dev/null
EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table
MOTIF_TYPE_DEFAULT?= dt # default 2.0 compatible libs type
@@ -26,8 +22,6 @@
ROOT_GROUP?= sys
ROOT_USER?= root
SERIAL_DEVICES?= /dev/null
-ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
-ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v`
# imake installs manpages in weird places
@@ -121,3 +115,5 @@
#GAMEMODE= 2555
#GAMEDIRMODE= 0775
#.endif
+
+.include "${.PARSEDIR}/defaults.mk"
diff -r 363a3523d4b3 -r 54c6794151cc mk/platform/Interix.mk
--- a/mk/platform/Interix.mk Thu Oct 18 13:01:59 2007 +0000
+++ b/mk/platform/Interix.mk Thu Oct 18 21:52:23 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.52 2007/07/02 14:03:40 joerg Exp $
+# $NetBSD: Interix.mk,v 1.53 2007/10/18 21:52:24 rillig Exp $
#
# Variable definitions for the Interix operating system.
@@ -79,9 +79,7 @@
###
Home |
Main Index |
Thread Index |
Old Index