pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Relax need to put GNU_CONFIGURE before inclusion of...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bd390a8a0ece
branches: trunk
changeset: 488210:bd390a8a0ece
user: tv <tv%pkgsrc.org@localhost>
date: Tue Jan 25 18:15:58 2005 +0000
description:
Relax need to put GNU_CONFIGURE before inclusion of bsd.prefs.mk:
Convert _OPSYS_MAX_CMDLEN to a plain _OPSYS_MAX_CMDLEN_CMD variable, which
is not evaluated by a shell until CONFIGURE_ENV is expanded (and only then
if USE_LIBTOOL+GNU_CONFIGURE are both set).
diffstat:
mk/bsd.pkg.mk | 6 +++---
mk/platform/AIX.mk | 6 ++----
mk/platform/BSDOS.mk | 6 ++----
mk/platform/Darwin.mk | 6 ++----
mk/platform/DragonFly.mk | 6 ++----
mk/platform/FreeBSD.mk | 6 ++----
mk/platform/IRIX.mk | 6 ++----
mk/platform/Interix.mk | 4 ++--
mk/platform/Linux.mk | 6 ++----
mk/platform/NetBSD.mk | 6 ++----
mk/platform/OpenBSD.mk | 6 ++----
mk/platform/SunOS.mk | 6 ++----
mk/platform/UnixWare.mk | 6 ++----
13 files changed, 27 insertions(+), 49 deletions(-)
diffs (258 lines):
diff -r b426e2ab3df6 -r bd390a8a0ece mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/bsd.pkg.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1573 2005/01/25 13:13:35 jmmv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1574 2005/01/25 18:15:58 tv Exp $
#
# This file is in the public domain.
#
@@ -378,8 +378,8 @@
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}
+. if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN_CMD)
+CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}
. endif
.endif
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/AIX.mk
--- a/mk/platform/AIX.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/AIX.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.5 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: AIX.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the AIX operating system.
@@ -174,9 +174,7 @@
# 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.
# 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
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/BSDOS.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.5 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -162,9 +162,7 @@
# 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.
# 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
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/Darwin.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.5 2004/12/20 13:09:04 grant Exp $
+# $NetBSD: Darwin.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the Darwin operating system.
@@ -153,9 +153,7 @@
# 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)
-_OPSYS_MAX_CMDLEN!= /usr/sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax
# Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU
# configure packages that break because of this by pretending that
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/DragonFly.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.7 2005/01/12 21:11:41 recht Exp $
+# $NetBSD: DragonFly.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the DragonFly operating system.
@@ -158,9 +158,7 @@
# 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)
-_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/FreeBSD.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.5 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -157,9 +157,7 @@
# 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)
-_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/IRIX.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.7 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the IRIX operating system.
@@ -167,9 +167,7 @@
# 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)
-_OPSYS_MAX_CMDLEN!= /usr/sbin/sysconf ARG_MAX
-.endif
+_OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysconf ARG_MAX
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/Interix.mk
--- a/mk/platform/Interix.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/Interix.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.21 2005/01/24 21:47:00 tv Exp $
+# $NetBSD: Interix.mk,v 1.22 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the Interix operating system.
@@ -195,7 +195,7 @@
# 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.
-_OPSYS_MAX_CMDLEN= 262144
+_OPSYS_MAX_CMDLEN_CMD= ${ECHO} 262144
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/Linux.mk
--- a/mk/platform/Linux.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/Linux.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.6 2004/12/29 23:19:43 minskim Exp $
+# $NetBSD: Linux.mk,v 1.7 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the Linux operating system.
@@ -195,9 +195,7 @@
# 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.
# 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
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/NetBSD.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.5 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -201,9 +201,7 @@
# 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)
-_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/OpenBSD.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.9 2004/12/27 08:38:09 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.10 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -167,9 +167,7 @@
# 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)
-_OPSYS_MAX_CMDLEN!= /sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/SunOS.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.7 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: SunOS.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -191,9 +191,7 @@
# 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.
# 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
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff -r b426e2ab3df6 -r bd390a8a0ece mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk Tue Jan 25 18:07:48 2005 +0000
+++ b/mk/platform/UnixWare.mk Tue Jan 25 18:15:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.5 2004/12/01 09:53:01 wiz Exp $
+# $NetBSD: UnixWare.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -160,9 +160,7 @@
# 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.
# 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
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# If games are to be installed setgid, then SETGIDGAME is set to 'yes'
# (it defaults to 'no' as per bsd.pkg.defaults.mk).
Home |
Main Index |
Thread Index |
Old Index