pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/tv-derecurse]: pkgsrc/mk Merge from HEAD.
details: https://anonhg.NetBSD.org/pkgsrc/rev/57ec02860c28
branches: tv-derecurse
changeset: 483970:57ec02860c28
user: tv <tv%pkgsrc.org@localhost>
date: Sun Nov 28 20:11:32 2004 +0000
description:
Merge from HEAD.
diffstat:
mk/bsd.options.mk | 38 +++++++++++------
mk/bsd.pkg.use.mk | 12 +-----
mk/bsd.sites.mk | 8 +-
mk/buildlink3/bsd.buildlink3.mk | 8 +--
mk/compiler/xlc.mk | 6 ++-
mk/db1.builtin.mk | 12 ++--
mk/defaults/mk.conf | 9 +---
mk/dlopen.buildlink3.mk | 44 ++++++++++++++++++++
mk/dlopen.builtin.mk | 86 +++++++++++++++++++++++++++++++++++++++++
mk/pthread.buildlink3.mk | 4 +-
mk/pthread.builtin.mk | 48 ++++++++++------------
11 files changed, 198 insertions(+), 77 deletions(-)
diffs (truncated from 458 to 300 lines):
diff -r 3a8357e8d115 -r 57ec02860c28 mk/bsd.options.mk
--- a/mk/bsd.options.mk Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/bsd.options.mk Sun Nov 28 20:11:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.9.4.1 2004/11/22 22:48:04 tv Exp $
+# $NetBSD: bsd.options.mk,v 1.9.4.2 2004/11/28 20:11:32 tv Exp $
#
# This Makefile fragment provides boilerplate code for standard naming
# conventions for handling per-package build options.
@@ -160,19 +160,7 @@
. endif
.endfor
-# Store the result in the +BUILD_INFO file so we can query for the build
-# options using "pkg_info -Q PKG_OPTIONS <pkg>".
-BUILD_DEFS_FIXED+= PKG_OPTIONS
-
-.if defined(PKG_SUPPORTED_OPTIONS)
-.PHONY: supported-options-message
-pre-extract: supported-options-message
-supported-options-message:
-. if !empty(PKG_SUPPORTED_OPTIONS)
- @${ECHO} "=========================================================================="
- @${ECHO} "The supported build options for this package are:"
- @${ECHO} ""
- @${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} | \
+_PKG_OPTIONS_WORDWRAP_FILTER= \
${AWK} ' \
BEGIN { printwidth = 40; line = "" } \
{ \
@@ -187,6 +175,28 @@
} \
END { if (length(line) > 0) print " "line } \
'
+
+# Store the result in the +BUILD_INFO file so we can query for the build
+# options using "pkg_info -Q PKG_OPTIONS <pkg>".
+BUILD_DEFS_FIXED+= PKG_OPTIONS
+
+.if defined(PKG_SUPPORTED_OPTIONS)
+.PHONY: supported-options-message
+pre-extract: supported-options-message
+supported-options-message:
+. if !empty(PKG_SUPPORTED_OPTIONS)
+ @${ECHO} "=========================================================================="
+ @${ECHO} "The supported build options for this package are:"
+ @${ECHO} ""
+ @${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} | \
+ ${_PKG_OPTIONS_WORDWRAP_FILTER}
+. if !empty(PKG_OPTIONS)
+ @${ECHO} ""
+ @${ECHO} "The currently selected options are:"
+ @${ECHO} ""
+ @${ECHO} "${PKG_OPTIONS}" | ${XARGS} -n 1 | ${SORT} | \
+ ${_PKG_OPTIONS_WORDWRAP_FILTER}
+. endif
@${ECHO} ""
@${ECHO} "You can select which build options to use by setting the following"
@${ECHO} "variables. Their current value is shown:"
diff -r 3a8357e8d115 -r 57ec02860c28 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/bsd.pkg.use.mk Sun Nov 28 20:11:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.1.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.1.2.2 2004/11/28 20:11:32 tv Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -183,17 +183,7 @@
_PERL5_DEPMETHOD= DEPENDS
. endif
_PERL5_DEPENDS= {perl>=${_PERL5_REQD},perl-thread>=${_PERL5_REQD}}
-#
-# On platforms that have native pthreads, default to installing the
-# threaded perl. This can be overridden by explicitly setting
-# PERL5_USE_THREADS.
-#
-. if exists(/usr/include/pthread.h) && \
- !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
-PERL5_PKGSRCDIR?= ../../lang/perl58-thread
-. else
PERL5_PKGSRCDIR?= ../../lang/perl58
-. endif
. if !defined(BUILDLINK_DEPENDS.perl)
${_PERL5_DEPMETHOD}+= ${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
. endif
diff -r 3a8357e8d115 -r 57ec02860c28 mk/bsd.sites.mk
--- a/mk/bsd.sites.mk Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/bsd.sites.mk Sun Nov 28 20:11:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20 2004/11/22 17:12:42 wiz Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.1 2004/11/28 20:11:32 tv Exp $
#
# Default MASTER_SITES
@@ -114,16 +114,16 @@
ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/
MASTER_SITE_SOURCEFORGE+= \
+ http://aleron.dl.sourceforge.net/sourceforge/ \
http://belnet.dl.sourceforge.net/sourceforge/ \
http://cesnet.dl.sourceforge.net/sourceforge/ \
- http://easynews.dl.sourceforge.net/sourceforge/ \
http://heanet.dl.sourceforge.net/sourceforge/ \
- http://keihanna.dl.sourceforge.net/sourceforge/ \
+ http://internap.dl.sourceforge.net/sourceforge/ \
+ http://jaist.dl.sourceforge.net/sourceforge/ \
http://mesh.dl.sourceforge.net/sourceforge/ \
http://optusnet.dl.sourceforge.net/sourceforge/ \
http://ovh.dl.sourceforge.net/sourceforge/ \
http://puzzle.dl.sourceforge.net/sourceforge/ \
- http://switch.dl.sourceforge.net/sourceforge/ \
http://umn.dl.sourceforge.net/sourceforge/ \
http://unc.dl.sourceforge.net/sourceforge/ \
http://voxel.dl.sourceforge.net/sourceforge/ \
diff -r 3a8357e8d115 -r 57ec02860c28 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk Sun Nov 28 20:11:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.163.2.2 2004/11/23 18:25:35 tv Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.163.2.3 2004/11/28 20:11:32 tv Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -91,7 +91,7 @@
BUILDLINK_SRCDIR= ${.CURDIR}/../../mk/buildlink3
BUILDLINK_X11_DIR= ${BUILDLINK_DIR:H}/.x11-buildlink
-.PHONY: pre-buildlink do-buildlink post-buildlink
+.PHONY: do-buildlink
# Prepend ${BUILDLINK_BINDIR} to the PATH.
PREPEND_PATH+= ${BUILDLINK_BINDIR}
@@ -1079,11 +1079,9 @@
-e "s|@PWD@|${PWD_CMD:Q}|g" \
| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
-WRAPPER_TARGETS+= pre-buildlink do-buildlink post-buildlink
+WRAPPER_TARGETS+= do-buildlink
-pre-buildlink: .OPTIONAL
do-buildlink: .OPTIONAL
-post-buildlink: .OPTIONAL
.endif # PHASES_AFTER_WRAPPER
###
diff -r 3a8357e8d115 -r 57ec02860c28 mk/compiler/xlc.mk
--- a/mk/compiler/xlc.mk Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/compiler/xlc.mk Sun Nov 28 20:11:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.2.2.1 2004/11/23 20:54:12 tv Exp $
+# $NetBSD: xlc.mk,v 1.2.2.2 2004/11/28 20:11:32 tv Exp $
.if !defined(COMPILER_XLC_MK)
COMPILER_XLC_MK= defined
@@ -47,6 +47,10 @@
PREPEND_PATH+= ${_XLC_DIR}/bin
.endif
+# Most packages assume alloca is available without #pragma alloca, so
+# make it the default.
+CFLAGS+=-ma
+
# Create compiler driver scripts in ${WRKDIR}.
.for _target_ in ${_XLC_LINKS}
. if !target(${${_target_}})
diff -r 3a8357e8d115 -r 57ec02860c28 mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/db1.builtin.mk Sun Nov 28 20:11:32 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: db1.builtin.mk,v 1.5 2004/11/17 15:12:08 jlam Exp $
+# $NetBSD: db1.builtin.mk,v 1.5.2.1 2004/11/28 20:11:32 tv Exp $
.for _lib_ in db db1
. if !defined(_BLNK_LIB_FOUND.${_lib_})
_BLNK_LIB_FOUND.${_lib_}!= \
- if ${TEST} `${ECHO} /usr/lib/lib${_lib_}.*` = "/usr/lib/lib${_lib_}.*"; then \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
${ECHO} "no"; \
- elif ${TEST} `${ECHO} /lib/lib${_lib_}.*` = "/lib/lib${_lib_}.*"; then \
- ${ECHO} "no"; \
- else \
- ${ECHO} "yes"; \
fi
BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
. endif
diff -r 3a8357e8d115 -r 57ec02860c28 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf Tue Nov 23 20:54:12 2004 +0000
+++ b/mk/defaults/mk.conf Sun Nov 28 20:11:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.1 2004/11/22 22:48:05 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.2 2004/11/28 20:11:32 tv Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -1484,11 +1484,6 @@
# 1 (allow all sockets to be viewed at all times)
# Default: 0
-LYNX_SCREEN_LIB?= curses
-# Used in lynx and lynx-current to set which screen library to use.
-# Possible: slang, ncurses, curses.
-# Default: curses
-
#M68060=
# Used mostly by packages (e.g.: gnupg, pgp2, ssh) which have fast
# 68020/030/040 assembler routines for multiprecision arithmetic
@@ -2035,7 +2030,7 @@
# Possible: YES, or NO.
# Default: YES
-#USE_GIF=
+USE_GIF?= yes
# Enable GIF support in qt1. (disabled per default due to licensing
# problems; future revisions might have no support at all)
# Also used by tiff-library to enable LZW compression support.
diff -r 3a8357e8d115 -r 57ec02860c28 mk/dlopen.buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/dlopen.buildlink3.mk Sun Nov 28 20:11:32 2004 +0000
@@ -0,0 +1,44 @@
+# $NetBSD: dlopen.buildlink3.mk,v 1.8.2.2 2004/11/28 20:11:32 tv Exp $
+#
+# This Makefile fragment is included by package Makefiles and
+# buildlink3.mk files for the packages that use dlopen().
+#
+DLOPEN_BUILDLINK3_MK:= ${DLOPEN_BUILDLINK3_MK}+
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(DLOPEN_BUILDLINK3_MK:M+)
+CHECK_BUILTIN.dl:= yes
+.include "../../mk/dlopen.builtin.mk"
+CHECK_BUILTIN.dl:= no
+.endif # DLOPEN_BUILDLINK3_MK
+
+DL_AUTO_VARS?= no
+
+.if !empty(USE_BUILTIN.dl:M[yY][eE][sS])
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndl}
+BUILDLINK_PACKAGES+= dl
+BUILDLINK_BUILTIN_MK.dl= ../../mk/dlopen.builtin.mk
+BUILDLINK_AUTO_VARS.dl= ${DL_AUTO_VARS}
+.elif ${OPSYS} == "Darwin"
+. include "../../devel/dlcompat/buildlink3.mk"
+BUILDLINK_AUTO_VARS.dlcompat= ${DL_AUTO_VARS}
+.else
+PKG_SKIP_REASON= "${PKGNAME} requires a working dlopen()."
+.endif
+
+.if !empty(DLOPEN_BUILDLINK3_MK:M+)
+#
+# Define user-visible DL_{CFLAGS,LDFLAGS,LIBS} as compiler options used
+# to compile/link code that uses dl*() functions.
+#
+DL_CFLAGS= ${BUILDLINK_CFLAGS.dl}
+DL_LDFLAGS= ${BUILDLINK_LDFLAGS.dl}
+DL_LIBS= ${BUILDLINK_LIBS.dl}
+CONFIGURE_ENV+= DL_CFLAGS="${DL_CFLAGS}"
+CONFIGURE_ENV+= DL_LDFLAGS="${DL_LDFLAGS}"
+CONFIGURE_ENV+= DL_LIBS="${DL_LIBS}"
+MAKE_ENV+= DL_CFLAGS="${DL_CFLAGS}"
+MAKE_ENV+= DL_LDFLAGS="${DL_LDFLAGS}"
+MAKE_ENV+= DL_LIBS="${DL_LIBS}"
+.endif # DLOPEN_BUILDLINK3_MK
diff -r 3a8357e8d115 -r 57ec02860c28 mk/dlopen.builtin.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/dlopen.builtin.mk Sun Nov 28 20:11:32 2004 +0000
@@ -0,0 +1,86 @@
+# $NetBSD: dlopen.builtin.mk,v 1.6.2.2 2004/11/28 20:11:32 tv Exp $
+
+.for _lib_ in dl
+. if !defined(_BLNK_LIB_FOUND.${_lib_})
+_BLNK_LIB_FOUND.${_lib_}!= \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
+ ${ECHO} "no"; \
+ fi
+BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
+. endif
+.endfor
+.undef _lib_
+
+.if !defined(IS_BUILTIN.dl)
+IS_BUILTIN.dl= no
+. if exists(/usr/include/dlfcn.h)
+IS_BUILTIN.dl= yes
+. endif
+BUILDLINK_VARS+= IS_BUILTIN.dl
+.endif # IS_BUILTIN.pthread
+
+.if !defined(USE_BUILTIN.dl)
+USE_BUILTIN.dl= ${IS_BUILTIN.dl}
+. if ${OPSYS} == "Darwin"
Home |
Main Index |
Thread Index |
Old Index