Module Name: src
Committed By: riz
Date: Sun Nov 21 17:32:53 UTC 2010
Modified Files:
src/lib/libpam [netbsd-5]: Makefile
src/lib/libpam/modules [netbsd-5]: mod.mk
src/share/mk [netbsd-5]: bsd.own.mk
Added Files:
src/lib/libpam/staticmodules [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by christos in ticket #1414):
lib/libpam/Makefile: revision 1.3
share/mk/bsd.own.mk: revision 1.612
lib/libpam/modules/mod.mk: revision 1.8
lib/libpam/modules/mod.mk: revision 1.9
lib/libpam/staticmodules/Makefile: revision 1.1
make the dependency to libpam, explicit. Fixes afpd in pkgsrc. From Mark Davies
XXX: Should be pulled up to 4.x and 5.x.
Build the modules in two phases:
1. build the static modules first, before libpam so that the static
libpam can link against the module .a files.
2. build the modules after the dynamic libpam is build, so that the
dynamic modules can link against the dynamic libpam.
enable MAKEDIRTARGET to be called with a separate environment,
called $MAKEDIRTARGETENV, defaulting to nothing.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.32.1 src/lib/libpam/Makefile
cvs rdiff -u -r1.6 -r1.6.2.1 src/lib/libpam/modules/mod.mk
cvs rdiff -u -r0 -r1.1.2.2 src/lib/libpam/staticmodules/Makefile
cvs rdiff -u -r1.542.2.11 -r1.542.2.12 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/lib/libpam/Makefile
diff -u src/lib/libpam/Makefile:1.2 src/lib/libpam/Makefile:1.2.32.1
--- src/lib/libpam/Makefile:1.2 Sun Dec 12 08:18:42 2004
+++ src/lib/libpam/Makefile Sun Nov 21 17:32:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:42 christos Exp $
+# $NetBSD: Makefile,v 1.2.32.1 2010/11/21 17:32:52 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= modules .WAIT libpam
+SUBDIR= staticmodules .WAIT libpam .WAIT modules
.include <bsd.subdir.mk>
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.6 src/lib/libpam/modules/mod.mk:1.6.2.1
--- src/lib/libpam/modules/mod.mk:1.6 Mon Oct 27 07:48:27 2008
+++ src/lib/libpam/modules/mod.mk Sun Nov 21 17:32:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.6 2008/10/27 07:48:27 mrg Exp $
+# $NetBSD: mod.mk,v 1.6.2.1 2010/11/21 17:32:52 riz Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -16,6 +16,7 @@
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.11 src/share/mk/bsd.own.mk:1.542.2.12
--- src/share/mk/bsd.own.mk:1.542.2.11 Tue Oct 20 01:28:59 2009
+++ src/share/mk/bsd.own.mk Sun Nov 21 17:32:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.542.2.11 2009/10/20 01:28:59 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.542.2.12 2010/11/21 17:32:52 riz Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -888,8 +888,9 @@
#
# MAKEDIRTARGET dir target [extra make(1) params]
-# run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message
+# run "cd $${dir} && ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}", with a pretty message
#
+MAKEDIRTARGETENV?=
MAKEDIRTARGET=\
@_makedirtarget() { \
dir="$$1"; shift; \
@@ -905,7 +906,7 @@
show=$${this:-.}; \
echo "$${target} ===> $${show%/}$${1:+ (with: $$@)}"; \
cd "$${real}" \
- && ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
+ && ${MAKEDIRTARGETENV} ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
}; \
_makedirtarget
Added files:
Index: src/lib/libpam/staticmodules/Makefile
diff -u /dev/null src/lib/libpam/staticmodules/Makefile:1.1.2.2
--- /dev/null Sun Nov 21 17:32:53 2010
+++ src/lib/libpam/staticmodules/Makefile Sun Nov 21 17:32:53 2010
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1.2.2 2010/11/21 17:32:53 riz Exp $
+
+MAKEDIRTARGETENV=MKPIC=no
+.include <bsd.own.mk>
+
+SUBDIR=${.CURDIR}/../modules
+
+.include <bsd.subdir.mk>
