diff options
author | tv <tv@pkgsrc.org> | 2004-11-16 18:04:00 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 2004-11-16 18:04:00 +0000 |
commit | 4b5d899ef87503df6e1b7cd17f47e94f3778f8b2 (patch) | |
tree | f2441ff2623536c13ec94978c02ca7fe9fab6405 /mk | |
parent | b05704ad43e9336b96b7e621fecc6fe44bd6d42a (diff) | |
download | pkgsrc-4b5d899ef87503df6e1b7cd17f47e94f3778f8b2.tar.gz |
Revert previous (re-add common CPP_PRECOMP_FLAGS). For consistency, also
move usage of _USER_DEPENDS and _OPSYS_MAX_CMDLEN to bsd.pkg.mk.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
-rw-r--r-- | mk/platform/AIX.mk | 6 | ||||
-rw-r--r-- | mk/platform/BSDOS.mk | 4 | ||||
-rw-r--r-- | mk/platform/Darwin.mk | 6 | ||||
-rw-r--r-- | mk/platform/DragonFly.mk | 6 | ||||
-rw-r--r-- | mk/platform/FreeBSD.mk | 6 | ||||
-rw-r--r-- | mk/platform/IRIX.mk | 4 | ||||
-rw-r--r-- | mk/platform/Interix.mk | 7 | ||||
-rw-r--r-- | mk/platform/Linux.mk | 4 | ||||
-rw-r--r-- | mk/platform/NetBSD.mk | 6 | ||||
-rw-r--r-- | mk/platform/OpenBSD.mk | 6 | ||||
-rw-r--r-- | mk/platform/SunOS.mk | 4 | ||||
-rw-r--r-- | mk/platform/UnixWare.mk | 4 |
13 files changed, 32 insertions, 40 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 507364d2ebc..feeb6db91f6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1538 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1539 2004/11/16 18:04:00 tv Exp $ # # This file is in the public domain. # @@ -379,6 +379,10 @@ _ULIMIT_CMD+= ${ULIMIT_CMD_${__tmp__}} ; . endfor .endif +CPPFLAGS+= ${CPP_PRECOMP_FLAGS} +DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} +DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} + # If GNU_CONFIGURE is defined, then pass LIBS to the GNU configure script. # also pass in a CONFIG_SHELL to avoid picking up bash .if defined(GNU_CONFIGURE) @@ -386,6 +390,9 @@ CONFIG_SHELL?= ${SH} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} CONFIGURE_ENV+= LIBS=${LIBS:Q} CONFIGURE_ENV+= install_sh=${INSTALL:Q} +. if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN) +CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} +. endif .endif # diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk index 99f1bbefdb5..62a4638c35e 100644 --- a/mk/platform/AIX.mk +++ b/mk/platform/AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: AIX.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: AIX.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the AIX operating system. @@ -114,10 +114,9 @@ GROUPADD?= /usr/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _USER_DEPENDS= user>=20000313:../../sysutils/user -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} .endif +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 @@ -186,7 +185,6 @@ SERIAL_DEVICES?= /dev/tty0 \ # FIXME: Adjust to work on this system and enable the lines below. #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) #_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -#CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} #.endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk index cd065e3e91f..3cb893ad497 100644 --- a/mk/platform/BSDOS.mk +++ b/mk/platform/BSDOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: BSDOS.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: BSDOS.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the BSD/OS operating system. @@ -98,6 +98,7 @@ XARGS?= /usr/bin/xargs USERADD?= /usr/sbin/adduser GROUPADD?= /usr/sbin/addgroup +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 0022 .if ${OBJECT_FMT} == "ELF" EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table @@ -166,7 +167,6 @@ PKG_CREATE_USERGROUP= NO # until it works # FIXME: Adjust to work on this system and enable the lines below. #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) #_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -#CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} #.endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk index 80e780dd0e0..8e6b43c6bfe 100644 --- a/mk/platform/Darwin.mk +++ b/mk/platform/Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: Darwin.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: Darwin.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the Darwin operating system. @@ -87,7 +87,6 @@ XARGS?= /usr/bin/xargs .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc) CPP_PRECOMP_FLAGS?= -no-cpp-precomp # use the GNU cpp, not the OS X cpp .endif -CPPFLAGS+= ${CPP_PRECOMP_FLAGS} DEF_UMASK?= 0022 DEFAULT_SERIAL_DEVICE?= /dev/null EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table @@ -107,8 +106,6 @@ USERADD?= ${LOCALBASE}/sbin/useradd _PKG_USER_HOME?= /var/empty # to match other system accounts _PKG_USER_SHELL?= /usr/bin/false # to match other system accounts _USER_DEPENDS= user>=20040801:../../sysutils/user_darwin -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} # imake installs manpages in weird places # these values from /usr/X11R6/lib/X11/config/Imake.tmpl @@ -158,7 +155,6 @@ LOCALBASE?= ${DESTDIR}/usr/pkg # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) _OPSYS_MAX_CMDLEN!= /usr/sbin/sysctl -n kern.argmax -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk index 9c9ec0b74b0..789117e608f 100644 --- a/mk/platform/DragonFly.mk +++ b/mk/platform/DragonFly.mk @@ -1,4 +1,4 @@ -# $NetBSD: DragonFly.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: DragonFly.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the DragonFly operating system. @@ -94,10 +94,9 @@ GROUPADD?= /usr/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _USER_DEPENDS= user>=20000313:../../sysutils/user -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} .endif +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 0022 .if ${OBJECT_FMT} == "ELF" EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table @@ -169,7 +168,6 @@ PKG_HAVE_KQUEUE= # defined # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) _OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk index 3f5327fb8d6..a3370cf7ab1 100644 --- a/mk/platform/FreeBSD.mk +++ b/mk/platform/FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: FreeBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: FreeBSD.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the FreeBSD operating system. @@ -94,10 +94,9 @@ GROUPADD?= /usr/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _USER_DEPENDS= user>=20000313:../../sysutils/user -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} .endif +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 0022 .if ${OBJECT_FMT} == "ELF" EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table @@ -169,7 +168,6 @@ PKG_HAVE_KQUEUE= # defined # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) _OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index 0cabfb3c57e..8db8bd16731 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.mk,v 1.5 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: IRIX.mk,v 1.6 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the IRIX operating system. @@ -92,6 +92,7 @@ TYPE?= /sbin/type WC?= /sbin/wc XARGS?= /sbin/xargs +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 022 DEFAULT_SERIAL_DEVICE?= /dev/null EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table @@ -170,7 +171,6 @@ LIBABISUFFIX= ${ABI} # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) _OPSYS_MAX_CMDLEN!= /usr/sbin/sysconf ARG_MAX -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk index 49ac5c60d8b..771a9e919cb 100644 --- a/mk/platform/Interix.mk +++ b/mk/platform/Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.mk,v 1.11 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: Interix.mk,v 1.12 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the Interix operating system. @@ -108,9 +108,8 @@ USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _PKG_USER_HOME?= # empty by default _USER_DEPENDS= user>=20040426:../../sysutils/user_interix -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 002 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table @@ -189,7 +188,7 @@ CONFIGURE_ENV+= ac_cv_header_poll_h=no ac_cv_func_poll=no # check for maximum command line length and set it in configure's environment, # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=262144 +_OPSYS_MAX_CMDLEN= 262144 .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index d7ee5e100e7..7287a15baad 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.4 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: Linux.mk,v 1.5 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the Linux operating system. @@ -129,6 +129,7 @@ TYPE?= type # Shell builtin WC?= /usr/bin/wc XARGS?= /usr/bin/xargs -r +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 022 DEFAULT_SERIAL_DEVICE?= /dev/null EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table @@ -196,7 +197,6 @@ LOCALBASE?= ${DESTDIR}/usr/pkg # FIXME: Adjust to work on this system and enable the lines below. #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) #_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -#CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} #.endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk index dba242bd4cb..50cd35d98c9 100644 --- a/mk/platform/NetBSD.mk +++ b/mk/platform/NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.mk,v 1.4 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: NetBSD.mk,v 1.5 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the NetBSD operating system. @@ -87,10 +87,9 @@ GROUPADD?= /usr/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _USER_DEPENDS= user>=20000313:../../sysutils/user -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} .endif +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 0022 .if ${OBJECT_FMT} == "ELF" EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table @@ -204,7 +203,6 @@ PKG_HAVE_KQUEUE= # defined # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) _OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk index cea2e4b80a4..6a96c95111a 100644 --- a/mk/platform/OpenBSD.mk +++ b/mk/platform/OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: OpenBSD.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: OpenBSD.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the OpenBSD operating system. @@ -85,10 +85,9 @@ GROUPADD?= /usr/sbin/groupadd USERADD?= ${LOCALBASE}/sbin/useradd GROUPADD?= ${LOCALBASE}/sbin/groupadd _USER_DEPENDS= user>=20000313:../../sysutils/user -DEPENDS+= ${USE_USERADD:D${_USER_DEPENDS}} -DEPENDS+= ${USE_GROUPADD:D${_USER_DEPENDS}} .endif +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 0022 .if ${OBJECT_FMT} == "ELF" EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E # add symbols to the dynamic symbol table @@ -174,7 +173,6 @@ SERIAL_DEVICES?= /dev/null # to avoid a test required by the libtool script that takes forever. .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) _OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} .endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk index 3a3218b3095..24b0c08ba17 100644 --- a/mk/platform/SunOS.mk +++ b/mk/platform/SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: SunOS.mk,v 1.6 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: SunOS.mk,v 1.7 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -90,6 +90,7 @@ TYPE?= /usr/bin/type WC?= /usr/bin/wc XARGS?= /usr/bin/xargs +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 022 DEFAULT_SERIAL_DEVICE?= /dev/null EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table @@ -192,7 +193,6 @@ PKG_TOOLS_BIN?= ${LOCALBASE}/bin # FIXME: Adjust to work on this system and enable the lines below. #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) #_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -#CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} #.endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk index 75ee4dcabca..6f79232a013 100644 --- a/mk/platform/UnixWare.mk +++ b/mk/platform/UnixWare.mk @@ -1,4 +1,4 @@ -# $NetBSD: UnixWare.mk,v 1.3 2004/11/16 16:21:40 tv Exp $ +# $NetBSD: UnixWare.mk,v 1.4 2004/11/16 18:04:00 tv Exp $ # # Variable definitions for the UnixWare 7 operating system. @@ -86,6 +86,7 @@ TYPE?= /usr/bin/type WC?= /usr/bin/wc XARGS?= /usr/bin/xargs +CPP_PRECOMP_FLAGS?= # unset DEF_UMASK?= 022 DEFAULT_SERIAL_DEVICE?= /dev/null EXPORT_SYMBOLS_LDFLAGS?= # Don't add symbols to the dynamic symbol table @@ -161,7 +162,6 @@ PKG_TOOLS_BIN?= ${LOCALBASE}/sbin # FIXME: Adjust to work on this system and enable the lines below. #.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL) #_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax -#CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN} #.endif # If games are to be installed setgid, then SETGIDGAME is set to 'yes' |