Module Name: src
Committed By: riz
Date: Thu Nov 25 00:27:20 UTC 2010
Modified Files:
src/doc [netbsd-5]: CHANGES-5.2
src/lib/libpam [netbsd-5]: Makefile
src/lib/libpam/modules [netbsd-5]: mod.mk
src/share/mk [netbsd-5]: bsd.own.mk
Removed Files:
src/lib/libpam/staticmodules [netbsd-5]: Makefile
Log Message:
Back out ticket #1414 until it can be fixed for amd64/sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-5.2
cvs rdiff -u -r1.2.32.1 -r1.2.32.2 src/lib/libpam/Makefile
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/lib/libpam/modules/mod.mk
cvs rdiff -u -r1.1.2.2 -r0 src/lib/libpam/staticmodules/Makefile
cvs rdiff -u -r1.542.2.12 -r1.542.2.13 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.29 src/doc/CHANGES-5.2:1.1.2.30
--- src/doc/CHANGES-5.2:1.1.2.29 Wed Nov 24 19:13:29 2010
+++ src/doc/CHANGES-5.2 Thu Nov 25 00:27:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.29 2010/11/24 19:13:29 riz Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.30 2010/11/25 00:27:19 riz Exp $
A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
release:
@@ -294,14 +294,6 @@
Don't blow up on date +''. From Robert Elz in followup to PR 39392.
[dholland, ticket #1411]
-lib/libpam/Makefile 1.3
-lib/libpam/modules/mod.mk 1.8-9
-lib/libpam/staticmodules/Makefile 1.1
-share/mk/bsd.own.mk 1.612
-
- Make the dependency to libpam explicit. Fixes afpd in pkgsrc.
- [christos, ticket #1414]
-
sys/kern/sys_lwp.c 1.50
Follow the correct locking protocol when creating an LWP and the
Index: src/lib/libpam/Makefile
diff -u src/lib/libpam/Makefile:1.2.32.1 src/lib/libpam/Makefile:1.2.32.2
--- src/lib/libpam/Makefile:1.2.32.1 Sun Nov 21 17:32:52 2010
+++ src/lib/libpam/Makefile Thu Nov 25 00:27:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.32.1 2010/11/21 17:32:52 riz Exp $
+# $NetBSD: Makefile,v 1.2.32.2 2010/11/25 00:27:20 riz Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -27,6 +27,6 @@
# The modules must be built first, because they are built into the
# static version of libpam.
-SUBDIR= staticmodules .WAIT libpam .WAIT modules
+SUBDIR= modules .WAIT libpam
.include <bsd.subdir.mk>
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.6.2.1 src/lib/libpam/modules/mod.mk:1.6.2.2
--- src/lib/libpam/modules/mod.mk:1.6.2.1 Sun Nov 21 17:32:52 2010
+++ src/lib/libpam/modules/mod.mk Thu Nov 25 00:27:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.6.2.1 2010/11/21 17:32:52 riz Exp $
+# $NetBSD: mod.mk,v 1.6.2.2 2010/11/25 00:27:20 riz Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -16,7 +16,6 @@
WARNS=3
.if ${MKPIC} != "no"
-LIBDPLIBS+= pam ${.CURDIR}/../../libpam
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.542.2.12 src/share/mk/bsd.own.mk:1.542.2.13
--- src/share/mk/bsd.own.mk:1.542.2.12 Sun Nov 21 17:32:52 2010
+++ src/share/mk/bsd.own.mk Thu Nov 25 00:27:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.542.2.12 2010/11/21 17:32:52 riz Exp $
+# $NetBSD: bsd.own.mk,v 1.542.2.13 2010/11/25 00:27:19 riz Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -888,9 +888,8 @@
#
# MAKEDIRTARGET dir target [extra make(1) params]
-# run "cd $${dir} && ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}", with a pretty message
+# run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message
#
-MAKEDIRTARGETENV?=
MAKEDIRTARGET=\
@_makedirtarget() { \
dir="$$1"; shift; \
@@ -906,7 +905,7 @@
show=$${this:-.}; \
echo "$${target} ===> $${show%/}$${1:+ (with: $$@)}"; \
cd "$${real}" \
- && ${MAKEDIRTARGETENV} ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
+ && ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
}; \
_makedirtarget
