pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/tv-derecurse]: pkgsrc/mk sync with HEAD
details: https://anonhg.NetBSD.org/pkgsrc/rev/96ec8887a6ed
branches: tv-derecurse
changeset: 483997:96ec8887a6ed
user: tv <tv%pkgsrc.org@localhost>
date: Fri Feb 25 14:46:51 2005 +0000
description:
sync with HEAD
diffstat:
mk/bsd.pkg.mk | 74 +++++++++++++++++++++++-------------
mk/bsd.pkg.subdir.mk | 11 ++---
mk/bsd.pkg.use.mk | 35 ++++-------------
mk/bsd.prefs.mk | 30 ++++++++++++--
mk/bsd.sites.mk | 27 ++-----------
mk/compiler.mk | 4 +-
mk/compiler/icc.mk | 11 +++++-
mk/platform/AIX.mk | 14 +++---
mk/platform/Linux.mk | 6 ++-
mk/plist.mk | 6 +-
mk/wrapper/bsd.wrapper.mk | 39 +++++++++++++++++++-
mk/wrapper/cmd-sink-aix-cc | 87 ++++++++++++++++++++++++++++++++++++++++++++
mk/wrapper/cmd-sink-aix-ld | 87 ++++++++++++++++++++++++++++++++++++++++++++
mk/wrapper/cmd-sink-icc81-cc | 64 ++++++++++++++++++++++++++++++++
mk/wrapper/transform-aix-cc | 52 ++++++++++++++++++++++++++
mk/wrapper/transform-icc-cc | 4 +-
16 files changed, 446 insertions(+), 105 deletions(-)
diffs (truncated from 916 to 300 lines):
diff -r cd233d292b0a -r 96ec8887a6ed mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue Feb 15 16:25:22 2005 +0000
+++ b/mk/bsd.pkg.mk Fri Feb 25 14:46:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1540.2.23 2005/02/15 16:25:22 tv Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1540.2.24 2005/02/25 14:46:51 tv Exp $
#
# This file is in the public domain.
#
@@ -78,6 +78,10 @@
. endif
. if exists(${PKGDIR}/PLIST.${OPSYS})
PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}
+. elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC+= ${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
+. elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
. elif exists(${PKGDIR}/PLIST)
PLIST_SRC+= ${PKGDIR}/PLIST
. endif
@@ -97,7 +101,7 @@
CONFIGURE_SCRIPT?= ./configure
DEPENDS?= # empty
DESCR_SRC?= ${PKGDIR}/DESCR
-DIGEST_ALGORITHM?= SHA1
+DIGEST_ALGORITHMS?= SHA1 RMD160
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
DISTINFO_FILE?= ${PKGDIR}/distinfo
EXTRACT_ONLY?= ${DISTFILES}
@@ -109,6 +113,7 @@
MAINTAINER?= tech-pkg%NetBSD.org@localhost
MAKE_FLAGS?= # empty
MAKEFILE?= Makefile
+PATCH_DIGEST_ALGORITHM?=SHA1
PKG_SUFX?= .tgz
PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR}
@@ -727,7 +732,6 @@
PKGBASE="${PKGBASE}" \
${AWK} '/^$$/ { next } \
/^\#.*/ { next } \
- $$1 !~ ENVIRON["PKGBASE"] { next } \
{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2,
ENVIRON["PKGNAME"], $$3); system(s); } \
' < ${PKGVULNDIR}/pkg-vulnerabilities || ${ECHO} 'could not check pkg-vulnerabilities file'
@@ -813,27 +817,33 @@
if [ ! -f ${DISTINFO_FILE} ]; then \
${ECHO_MSG} "=> No checksum file."; \
else \
- (cd ${DISTDIR}; OK="true"; \
+ (cd ${DISTDIR}; OK="true"; missing=""; \
for file in "" ${_CKSUMFILES}; do \
if [ "X$$file" = X"" ]; then continue; fi; \
- alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \
- if [ "X$$alg" = "X" ]; then \
- ${ECHO_MSG} "=> No checksum recorded for $$file."; \
- OK="false"; \
- else \
- CKSUM=`${DIGEST} $$alg < $$file`; \
- CKSUM2=`${AWK} '$$1 == "'$$alg'" && $$2 == "('$$file')"{print $$4;}' ${DISTINFO_FILE}`; \
- if [ "$$CKSUM2" = "IGNORE" ]; then \
- ${ECHO_MSG} "=> Checksum for $$file is set to IGNORE in checksum file even though"; \
- ${ECHO_MSG} " the file is not in the "'$$'"{IGNOREFILES} list."; \
- OK="false"; \
- elif [ "$$CKSUM" = "$$CKSUM2" ]; then \
- ${ECHO_MSG} "=> Checksum OK for $$file."; \
- else \
- ${ECHO_MSG} "=> Checksum mismatch for $$file."; \
- OK="false"; \
- fi; \
- fi; \
+ filesummed=false; \
+ for a in ${DIGEST_ALGORITHMS}; do \
+ CKSUM2=`${AWK} 'NF == 4 && $$1 == "'$$a'" && $$2 == "('$$file')" && $$3 == "=" {print $$4;}' ${DISTINFO_FILE}`; \
+ case "$${CKSUM2}" in \
+ "") ${ECHO_MSG} "=> No $$a checksum recorded for $$file."; \
+ ;; \
+ *) filesummed=true; \
+ CKSUM=`${DIGEST} $$a < $$file`; \
+ if [ "$$CKSUM2" = "IGNORE" ]; then \
+ ${ECHO_MSG} "=> Checksum for $$file is set to IGNORE in checksum file even though"; \
+ ${ECHO_MSG} " the file is not in the "'$$'"{IGNOREFILES} list."; \
+ OK="false"; \
+ elif [ "$$CKSUM" = "$$CKSUM2" ]; then \
+ ${ECHO_MSG} "=> Checksum $$a OK for $$file."; \
+ else \
+ ${ECHO_MSG} "=> Checksum $$a mismatch for $$file."; \
+ OK="false"; \
+ fi ;; \
+ esac; \
+ done; \
+ case "$$filesummed" in \
+ false) missing="$$missing $$file"; \
+ OK=false ;; \
+ esac; \
done; \
for file in "" ${_IGNOREFILES}; do \
if [ "X$$file" = X"" ]; then continue; fi; \
@@ -848,6 +858,10 @@
fi; \
done; \
if [ "$$OK" != "true" ]; then \
+ case "$$missing" in \
+ "") ;; \
+ *) ${ECHO_MSG} "Missing checksums for $$missing";; \
+ esac; \
${ECHO_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \
${ECHO_MSG} "are up to date. If you want to override this check, type"; \
${ECHO_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \
@@ -1570,7 +1584,7 @@
. for def in ${EVAL_PREFIX}
. if !defined(${def:C/=.*$//})
${def:C/=.*$//}_DEFAULT?=${LOCALBASE}
-_${def:C/=.*$//}_CMD= ${PKG_INFO} -qp ${def:C/^.*=//} 2>/dev/null | ${AWK} '{ print $$2; exit }' | grep '' || ${ECHO} ${${def:C/=.*$//}_DEFAULT}
+_${def:C/=.*$//}_CMD= ${PKG_INFO} -qp ${def:C/^.*=//} 2>/dev/null | ${AWK} '{ print $$2; exit }' | ${GREP} . || ${ECHO} ${${def:C/=.*$//}_DEFAULT}
${def:C/=.*$//}= ${_${def:C/=.*$//}_CMD:sh}
. endif
. endfor
@@ -1827,12 +1841,18 @@
cd ${DISTDIR}; \
for sumfile in "" ${_CKSUMFILES}; do \
if [ "X$$sumfile" = "X" ]; then continue; fi; \
- ${DIGEST} ${DIGEST_ALGORITHM} $$sumfile >> $$newfile; \
+ for a in "" ${DIGEST_ALGORITHMS}; do \
+ if [ "X$$a" = "X" ]; then continue; fi; \
+ ${DIGEST} $$a $$sumfile >> $$newfile; \
+ done; \
${WC} -c $$sumfile | ${AWK} '{ print "Size (" $$2 ") = " $$1 " bytes" }' >> $$newfile; \
done; \
for ignore in "" ${_IGNOREFILES}; do \
if [ "X$$ignore" = "X" ]; then continue; fi; \
- ${ECHO} "${DIGEST_ALGORITHM} ($$ignore) = IGNORE" >> $$newfile; \
+ for a in "" ${DIGEST_ALGORITHMS}; do \
+ if [ "X$$a" = "X" ]; then continue; fi; \
+ ${ECHO} "$$a ($$ignore) = IGNORE" >> $$newfile; \
+ done; \
done; \
if [ -f ${DISTINFO_FILE} ]; then \
${AWK} '$$2 ~ /\(patch-[a-z0-9]+\)/ { print $$0 }' < ${DISTINFO_FILE} >> $$newfile; \
@@ -1864,7 +1884,7 @@
case $$sumfile in \
patch-local-*) ;; \
*.orig|*.rej|*~) continue ;; \
- *) ${ECHO} "${DIGEST_ALGORITHM} ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${DIGEST} ${DIGEST_ALGORITHM}`" >> $$newfile;; \
+ *) ${ECHO} "${PATCH_DIGEST_ALGORITHM} ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${DIGEST} ${DIGEST_ALGORITHM}`" >> $$newfile;; \
esac; \
done); \
fi; \
@@ -1973,7 +1993,7 @@
if [ -n "${FAILOVER_FETCH}" -a -f ${DISTINFO_FILE} -a -f ${_DISTDIR}/$$bfile ]; then \
alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \
if [ -z "$$alg" ]; then \
- alg=${DIGEST_ALGORITHM};\
+ alg=${PATCH_DIGEST_ALGORITHM};\
fi; \
CKSUM=`${DIGEST} $$alg < ${_DISTDIR}/$$bfile`; \
CKSUM2=`${AWK} '$$1 == "'$$alg'" && $$2 == "('$$file')" {print $$4;}' <${DISTINFO_FILE}`; \
diff -r cd233d292b0a -r 96ec8887a6ed mk/bsd.pkg.subdir.mk
--- a/mk/bsd.pkg.subdir.mk Tue Feb 15 16:25:22 2005 +0000
+++ b/mk/bsd.pkg.subdir.mk Fri Feb 25 14:46:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.subdir.mk,v 1.55 2004/04/07 14:14:12 tv Exp $
+# $NetBSD: bsd.pkg.subdir.mk,v 1.55.6.1 2005/02/25 14:46:51 tv Exp $
# Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
#
@@ -86,11 +86,10 @@
.for __target in all fetch package extract configure build clean \
cleandir distclean depend describe reinstall tags checksum \
- makepatchsum mirror-distfiles deinstall show-downlevel \
- show-pkgsrc-dir show-var show-vars bulk-install bulk-package \
- fetch-list-one-pkg fetch-list-recursive \
- update clean-update \
- lint \
+ makedistinfo makepatchsum makesum mirror-distfiles deinstall \
+ show-downlevel show-pkgsrc-dir show-var show-vars \
+ bulk-install bulk-package fetch-list-one-pkg \
+ fetch-list-recursive update clean-update lint \
${PKG_MISC_TARGETS}
.if !target(__target)
${__target}: _SUBDIRUSE
diff -r cd233d292b0a -r 96ec8887a6ed mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Tue Feb 15 16:25:22 2005 +0000
+++ b/mk/bsd.pkg.use.mk Fri Feb 25 14:46:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.1.2.8 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.1.2.9 2005/02/25 14:46:51 tv Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -162,36 +162,17 @@
.if defined(USE_PERL5) && (${USE_PERL5} == "run")
CONFIGURE_ENV+= PERL=${PERL5:Q}
-. if !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
-. if exists(${PERL5})
-PERL5_SITELIB!= eval `${PERL5} -V:installsitelib 2>/dev/null`; \
- ${ECHO} $${installsitelib}
-PERL5_SITEARCH!= eval `${PERL5} -V:installsitearch 2>/dev/null`; \
- ${ECHO} $${installsitearch}
-PERL5_ARCHLIB!= eval `${PERL5} -V:installarchlib 2>/dev/null`; \
- ${ECHO} $${installarchlib}
-. if ${PKG_INSTALLATION_TYPE} == "overwrite"
-_PERL5_PREFIX!= eval `${PERL5} -V:prefix 2>/dev/null`; \
- ${ECHO} $${prefix}
-PERL5_SITELIB:= ${PERL5_SITELIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-PERL5_SITEARCH:= ${PERL5_SITEARCH:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-PERL5_ARCHLIB:= ${PERL5_ARCHLIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-MAKEFLAGS+= PERL5_SITELIB=${PERL5_SITELIB:Q}
-MAKEFLAGS+= PERL5_SITEARCH=${PERL5_SITEARCH:Q}
-MAKEFLAGS+= PERL5_ARCHLIB=${PERL5_ARCHLIB:Q}
-. endif # PKG_INSTALLATION_TYPE == "overwrite"
-. endif # exists($PERL5)
-. endif # !defined(PERL5_*)
+. include "../../lang/perl5/vars.mk"
.endif # USE_PERL5 == run
-.if defined(PERL5_SITELIB)
-PLIST_SUBST+= PERL5_SITELIB=${PERL5_SITELIB:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLSITELIB)
+PLIST_SUBST+= PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
.endif
-.if defined(PERL5_SITEARCH)
-PLIST_SUBST+= PERL5_SITEARCH=${PERL5_SITEARCH:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLSITEARCH)
+PLIST_SUBST+= PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
.endif
-.if defined(PERL5_ARCHLIB)
-PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLARCHLIB)
+PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
.endif
### USE_RMAN
diff -r cd233d292b0a -r 96ec8887a6ed mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Tue Feb 15 16:25:22 2005 +0000
+++ b/mk/bsd.prefs.mk Fri Feb 25 14:46:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.177.2.5 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.177.2.6 2005/02/25 14:46:51 tv Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -72,6 +72,7 @@
GNU_ARCH.mipsel?= mipsel
GNU_ARCH.ns32k?= ns32k
GNU_ARCH.powerpc?= powerpc
+GNU_ARCH.rs6000?= rs6000
GNU_ARCH.sh3eb?= sh
GNU_ARCH.sh3el?= shle
GNU_ARCH.sparc?= sparc
@@ -172,6 +173,25 @@
LOWER_OPSYS?= osf${OS_VERSION}
LOWER_VENDOR?= dec
+.elif ${OPSYS} == "AIX"
+LOWER_ARCH!= _cpuid=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $$1 }'`; \
+ if /usr/sbin/lsattr -El $$_cpuid | grep ' POWER' >/dev/null 2>&1; then \
+ echo rs6000; \
+ else \
+ echo powerpc; \
+ fi
+MACHINE_ARCH?= ${LOWER_ARCH}
+. if exists(/usr/bin/oslevel)
+_OS_VERSION!= /usr/bin/oslevel
+. else
+_OS_VERSION!= echo `${UNAME} -v`.`${UNAME} -r`
+. endif
+OS_VERSION!= echo ${_OS_VERSION} | sed -e 's,\([0-9]*\.[0-9]*\).*,\1,'
+LOWER_OS_VERSION= ${OS_VERSION}
+LOWER_OPSYS_VERSUFFIX= ${_OS_VERSION}
+LOWER_OPSYS?= aix
+LOWER_VENDOR?= ibm
+
.elif !defined(LOWER_OPSYS)
LOWER_OPSYS!= echo ${OPSYS} | tr A-Z a-z
.endif
@@ -227,10 +247,10 @@
. else
OBJECT_FMT?= a.out
. endif
-.endif
-
-.if ${OPSYS} == "DragonFly"
-OBJECT_FMT= ELF
+.elif ${OPSYS} == "DragonFly"
+OBJECT_FMT= ELF
+.elif ${OPSYS} == "AIX"
+OBJECT_FMT= XCOFF
.endif
# Calculate depth
diff -r cd233d292b0a -r 96ec8887a6ed mk/bsd.sites.mk
--- a/mk/bsd.sites.mk Tue Feb 15 16:25:22 2005 +0000
+++ b/mk/bsd.sites.mk Fri Feb 25 14:46:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.5 2004/12/20 20:46:00 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.6 2005/02/25 14:46:51 tv Exp $
#
Home |
Main Index |
Thread Index |
Old Index