svn commit: r245892 - in projects/bmake/lib/libpam: . libpam static_modules
Simon J. Gerraty
sjg at FreeBSD.org
Thu Jan 24 19:09:40 UTC 2013
Author: sjg
Date: Thu Jan 24 19:09:38 2013
New Revision: 245892
URL: http://svnweb.freebsd.org/changeset/base/245892
Log:
Move build of openpam_static_modules.o to its own subdir
to avoid circular dependency b/w libpam and modules.
Reviewed by: obrien
Added:
projects/bmake/lib/libpam/static_modules/
projects/bmake/lib/libpam/static_modules/Makefile
- copied, changed from r242503, projects/bmake/lib/libpam/libpam/Makefile
projects/bmake/lib/libpam/static_modules/Makefile.depend (contents, props changed)
Modified:
projects/bmake/lib/libpam/Makefile
projects/bmake/lib/libpam/libpam/Makefile
projects/bmake/lib/libpam/libpam/Makefile.depend
Modified: projects/bmake/lib/libpam/Makefile
==============================================================================
--- projects/bmake/lib/libpam/Makefile Thu Jan 24 17:28:39 2013 (r245891)
+++ projects/bmake/lib/libpam/Makefile Thu Jan 24 19:09:38 2013 (r245892)
@@ -26,6 +26,6 @@
# The modules must be built first, because they are built into the
# static version of libpam.
-SUBDIR+= modules libpam
+SUBDIR+= modules libpam static_modules
.include <bsd.subdir.mk>
Modified: projects/bmake/lib/libpam/libpam/Makefile
==============================================================================
--- projects/bmake/lib/libpam/libpam/Makefile Thu Jan 24 17:28:39 2013 (r245891)
+++ projects/bmake/lib/libpam/libpam/Makefile Thu Jan 24 19:09:38 2013 (r245892)
@@ -166,29 +166,6 @@ HEADERS= security/openpam.h \
ADD_HEADERS= security/pam_mod_misc.h
-#
-# Static modules
-#
-# We build static versions of all modules and of openpam_static.o,
-# then link them all together into openpam_static_modules.o. None of
-# the modules export any symbols, but they store structures with
-# pointers to their service functions in a linker set which the code
-# in openpam_static.c traverses to locate the individual modules.
-#
-MODULE_DIR= ../modules
-.include "${.CURDIR}/${MODULE_DIR}/modules.inc"
-STATIC_MODULES= ${MODULES:C/.*/${MODULE_DIR}\/&\/lib&.a/}
-STATICOBJS+= openpam_static_modules.o
-CLEANFILES+= openpam_static.o \
- openpam_static_modules.o
-
-openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
- ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC}
-
-# We can't put openpam_static.c in SRCS, but we still want to scan it
-# for dependencies.
-DPSRCS= openpam_static.c
-
# Headers
INCS= ${HEADERS} ${ADD_HEADERS}
INCSDIR= ${INCLUDEDIR}/security
Modified: projects/bmake/lib/libpam/libpam/Makefile.depend
==============================================================================
--- projects/bmake/lib/libpam/libpam/Makefile.depend Thu Jan 24 17:28:39 2013 (r245891)
+++ projects/bmake/lib/libpam/libpam/Makefile.depend Thu Jan 24 19:09:38 2013 (r245892)
@@ -10,30 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libpam/modules/pam_chroot \
- lib/libpam/modules/pam_deny \
- lib/libpam/modules/pam_echo \
- lib/libpam/modules/pam_exec \
- lib/libpam/modules/pam_ftpusers \
- lib/libpam/modules/pam_group \
- lib/libpam/modules/pam_guest \
- lib/libpam/modules/pam_krb5 \
- lib/libpam/modules/pam_ksu \
- lib/libpam/modules/pam_lastlog \
- lib/libpam/modules/pam_login_access \
- lib/libpam/modules/pam_nologin \
- lib/libpam/modules/pam_opie \
- lib/libpam/modules/pam_opieaccess \
- lib/libpam/modules/pam_passwdqc \
- lib/libpam/modules/pam_permit \
- lib/libpam/modules/pam_radius \
- lib/libpam/modules/pam_rhosts \
- lib/libpam/modules/pam_rootok \
- lib/libpam/modules/pam_securetty \
- lib/libpam/modules/pam_self \
- lib/libpam/modules/pam_ssh \
- lib/libpam/modules/pam_tacplus \
- lib/libpam/modules/pam_unix \
.include <dirdeps.mk>
Copied and modified: projects/bmake/lib/libpam/static_modules/Makefile (from r242503, projects/bmake/lib/libpam/libpam/Makefile)
==============================================================================
--- projects/bmake/lib/libpam/libpam/Makefile Sat Nov 3 00:30:22 2012 (r242503, copy source)
+++ projects/bmake/lib/libpam/static_modules/Makefile Thu Jan 24 19:09:38 2013 (r245892)
@@ -1,5 +1,5 @@
#-
-# Copyright (c) 1998 Juniper Networks, Inc.
+# Copyright (c) 1998, 2013 Juniper Networks, Inc.
# All rights reserved.
# Copyright (c) 2002 Networks Associates Technology, Inc.
# All rights reserved.
@@ -35,136 +35,15 @@
#
# $FreeBSD$
-OPENPAM= ${.CURDIR}/../../../contrib/openpam
-.PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
+OPENPAM= ${.CURDIR:H:H:H}/contrib/openpam
+.PATH: ${OPENPAM}/lib
-LIB= pam
-NO_PROFILE=
+all:
-SRCS= openpam_borrow_cred.c \
- openpam_check_owner_perms.c \
- openpam_configure.c \
- openpam_constants.c \
- openpam_dispatch.c \
- openpam_dynamic.c \
- openpam_features.c \
- openpam_findenv.c \
- openpam_free_data.c \
- openpam_free_envlist.c \
- openpam_get_feature.c \
- openpam_get_option.c \
- openpam_load.c \
- openpam_log.c \
- openpam_nullconv.c \
- openpam_readline.c \
- openpam_readlinev.c \
- openpam_readword.c \
- openpam_restore_cred.c \
- openpam_set_feature.c \
- openpam_set_option.c \
- openpam_straddch.c \
- openpam_subst.c \
- openpam_ttyconv.c \
- pam_acct_mgmt.c \
- pam_authenticate.c \
- pam_chauthtok.c \
- pam_close_session.c \
- pam_end.c \
- pam_error.c \
- pam_get_authtok.c \
- pam_get_data.c \
- pam_get_item.c \
- pam_get_user.c \
- pam_getenv.c \
- pam_getenvlist.c \
- pam_info.c \
- pam_open_session.c \
- pam_prompt.c \
- pam_putenv.c \
- pam_set_data.c \
- pam_set_item.c \
- pam_setcred.c \
- pam_setenv.c \
- pam_start.c \
- pam_strerror.c \
- pam_verror.c \
- pam_vinfo.c \
- pam_vprompt.c
-# Local additions
-SRCS+= pam_debug_log.c
-
-MAN= openpam.3 \
- openpam_borrow_cred.3 \
- openpam_free_data.3 \
- openpam_free_envlist.3 \
- openpam_get_feature.3 \
- openpam_get_option.3 \
- openpam_log.3 \
- openpam_nullconv.3 \
- openpam_readline.3 \
- openpam_readlinev.3 \
- openpam_readword.3 \
- openpam_restore_cred.3 \
- openpam_set_feature.3 \
- openpam_set_option.3 \
- openpam_straddch.3 \
- openpam_subst.3 \
- openpam_ttyconv.3 \
- pam.3 \
- pam_acct_mgmt.3 \
- pam_authenticate.3 \
- pam_chauthtok.3 \
- pam_close_session.3 \
- pam_conv.3 \
- pam_end.3 \
- pam_error.3 \
- pam_get_authtok.3 \
- pam_get_data.3 \
- pam_get_item.3 \
- pam_get_user.3 \
- pam_getenv.3 \
- pam_getenvlist.3 \
- pam_info.3 \
- pam_open_session.3 \
- pam_prompt.3 \
- pam_putenv.3 \
- pam_set_data.3 \
- pam_set_item.3 \
- pam_setcred.3 \
- pam_setenv.3 \
- pam_sm_acct_mgmt.3 \
- pam_sm_authenticate.3 \
- pam_sm_chauthtok.3 \
- pam_sm_close_session.3 \
- pam_sm_open_session.3 \
- pam_sm_setcred.3 \
- pam_start.3 \
- pam_strerror.3 \
- pam_verror.3 \
- pam_vinfo.3 \
- pam_vprompt.3 \
- pam.conf.5
-
-MLINKS= pam.conf.5 pam.d.5
-
-CSTD?= c99
-CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include
-CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR}
-CFLAGS+= -DOPENPAM_MODULES_DIR='"${PAM_MOD_DIR:C/\/*$//}/"'
-CFLAGS+= -DHAVE_FDLOPEN=1
-CFLAGS+= -DHAVE_FPURGE=1
-CFLAGS+= -DHAVE_STRLCAT=1
-CFLAGS+= -DHAVE_STRLCPY=1
-
-HEADERS= security/openpam.h \
- security/openpam_attr.h \
- security/openpam_version.h \
- security/pam_appl.h \
- security/pam_constants.h \
- security/pam_modules.h \
- security/pam_types.h \
+SRCS = openpam_static.c
-ADD_HEADERS= security/pam_mod_misc.h
+NO_PROFILE=
+NO_MAN=
#
# Static modules
@@ -185,12 +64,8 @@ CLEANFILES+= openpam_static.o \
openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC}
-# We can't put openpam_static.c in SRCS, but we still want to scan it
-# for dependencies.
-DPSRCS= openpam_static.c
-
-# Headers
-INCS= ${HEADERS} ${ADD_HEADERS}
-INCSDIR= ${INCLUDEDIR}/security
+.include <bsd.prog.mk>
-.include <bsd.lib.mk>
+.if empty(_SKIP_BUILD)
+all: ${STATICOBJS}
+.endif
Added: projects/bmake/lib/libpam/static_modules/Makefile.depend
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/bmake/lib/libpam/static_modules/Makefile.depend Thu Jan 24 19:09:38 2013 (r245892)
@@ -0,0 +1,41 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+ include \
+ include/xlocale \
+ lib/libpam/libpam \
+ lib/libpam/modules/pam_chroot \
+ lib/libpam/modules/pam_deny \
+ lib/libpam/modules/pam_echo \
+ lib/libpam/modules/pam_exec \
+ lib/libpam/modules/pam_ftpusers \
+ lib/libpam/modules/pam_group \
+ lib/libpam/modules/pam_guest \
+ lib/libpam/modules/pam_krb5 \
+ lib/libpam/modules/pam_ksu \
+ lib/libpam/modules/pam_lastlog \
+ lib/libpam/modules/pam_login_access \
+ lib/libpam/modules/pam_nologin \
+ lib/libpam/modules/pam_opie \
+ lib/libpam/modules/pam_opieaccess \
+ lib/libpam/modules/pam_passwdqc \
+ lib/libpam/modules/pam_permit \
+ lib/libpam/modules/pam_radius \
+ lib/libpam/modules/pam_rhosts \
+ lib/libpam/modules/pam_rootok \
+ lib/libpam/modules/pam_securetty \
+ lib/libpam/modules/pam_self \
+ lib/libpam/modules/pam_ssh \
+ lib/libpam/modules/pam_tacplus \
+ lib/libpam/modules/pam_unix \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
More information about the svn-src-projects
mailing list