Module Name: src Committed By: riz Date: Fri Jan 7 23:50:30 UTC 2011
Modified Files: src/lib/libpam [netbsd-5]: Makefile src/lib/libpam/modules [netbsd-5]: mod.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. 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. To generate a diff of this commit: cvs rdiff -u -r1.2.32.2 -r1.2.32.3 src/lib/libpam/Makefile cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/lib/libpam/modules/mod.mk cvs rdiff -u -r0 -r1.1.2.4 src/lib/libpam/staticmodules/Makefile 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.32.2 src/lib/libpam/Makefile:1.2.32.3 --- src/lib/libpam/Makefile:1.2.32.2 Thu Nov 25 00:27:20 2010 +++ src/lib/libpam/Makefile Fri Jan 7 23:50:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2.32.2 2010/11/25 00:27:20 riz Exp $ +# $NetBSD: Makefile,v 1.2.32.3 2011/01/07 23:50:30 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.2.3 src/lib/libpam/modules/mod.mk:1.6.2.4 --- src/lib/libpam/modules/mod.mk:1.6.2.3 Thu Jan 6 05:20:24 2011 +++ src/lib/libpam/modules/mod.mk Fri Jan 7 23:50:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mod.mk,v 1.6.2.3 2011/01/06 05:20:24 riz Exp $ +# $NetBSD: mod.mk,v 1.6.2.4 2011/01/07 23:50:30 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 Added files: Index: src/lib/libpam/staticmodules/Makefile diff -u /dev/null src/lib/libpam/staticmodules/Makefile:1.1.2.4 --- /dev/null Fri Jan 7 23:50:30 2011 +++ src/lib/libpam/staticmodules/Makefile Fri Jan 7 23:50:30 2011 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1.2.4 2011/01/07 23:50:30 riz Exp $ + +MAKEDIRTARGETENV=MKPIC=no +.include <bsd.own.mk> + +SUBDIR=${.CURDIR}/../modules + +.include <bsd.subdir.mk>