Make dynamic PAM modules depend on dynamic PAM library.
Requested by: des, markm
This commit is contained in:
parent
3b55a72359
commit
3f66c888ec
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=106921
@ -729,7 +729,8 @@ _generic_libs+= kerberosIV/lib
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \
|
_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \
|
||||||
lib/libncurses lib/libopie lib/libradius lib/librpcsvc \
|
lib/libncurses lib/libopie lib/libpam lib/libradius \
|
||||||
|
lib/librpcsvc \
|
||||||
lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
|
lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \
|
||||||
lib/libz lib/msun
|
lib/libz lib/msun
|
||||||
|
|
||||||
@ -755,7 +756,7 @@ _generic_libs+= usr.bin/lex/lib
|
|||||||
_generic_libs+= usr.sbin/pcvt/keycap
|
_generic_libs+= usr.sbin/pcvt/keycap
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs}
|
.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
|
||||||
${_lib}__L: .PHONY
|
${_lib}__L: .PHONY
|
||||||
.if exists(${.CURDIR}/${_lib})
|
.if exists(${.CURDIR}/${_lib})
|
||||||
${ECHODIR} "===> ${_lib}"; \
|
${ECHODIR} "===> ${_lib}"; \
|
||||||
@ -766,6 +767,16 @@ ${_lib}__L: .PHONY
|
|||||||
.endif
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
|
# libpam is special: we need to build static PAM modules before
|
||||||
|
# static PAM library, and dynamic PAM library before dynamic PAM
|
||||||
|
# modules.
|
||||||
|
lib/libpam__L: .PHONY
|
||||||
|
${ECHODIR} "===> lib/libpam"; \
|
||||||
|
cd ${.CURDIR}/lib/libpam; \
|
||||||
|
${MAKE} DIRPRFX=lib/libpam/ depend; \
|
||||||
|
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
|
||||||
|
${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
|
||||||
|
|
||||||
_startup_libs: ${_startup_libs:S/$/__L/}
|
_startup_libs: ${_startup_libs:S/$/__L/}
|
||||||
_prebuild_libs: ${_prebuild_libs:S/$/__L/}
|
_prebuild_libs: ${_prebuild_libs:S/$/__L/}
|
||||||
_generic_libs: ${_generic_libs:S/$/__L/}
|
_generic_libs: ${_generic_libs:S/$/__L/}
|
||||||
|
@ -4,7 +4,6 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam
|
|||||||
|
|
||||||
NOINSTALLLIB= yes
|
NOINSTALLLIB= yes
|
||||||
NOPROFILE= yes
|
NOPROFILE= yes
|
||||||
SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
|
|
||||||
|
|
||||||
CFLAGS+= -I${PAMDIR}/include
|
CFLAGS+= -I${PAMDIR}/include
|
||||||
CFLAGS+= -I${.CURDIR}/../../libpam
|
CFLAGS+= -I${.CURDIR}/../../libpam
|
||||||
@ -14,8 +13,12 @@ NO_WERROR= yes
|
|||||||
# This is nasty.
|
# This is nasty.
|
||||||
# For the static case, libpam.a depends on the modules.
|
# For the static case, libpam.a depends on the modules.
|
||||||
# For the dynamic case, the modules depend on libpam.so.N
|
# For the dynamic case, the modules depend on libpam.so.N
|
||||||
# Punt for the time being until I can figure out how to do it.
|
.if defined(_NO_LIBPAM_SO_YET)
|
||||||
#DPADD+= ${LIBPAM}
|
NOPIC= YES
|
||||||
#LDADD+= -lpam
|
.else
|
||||||
|
SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
|
||||||
|
DPADD+= ${LIBPAM}
|
||||||
|
LDADD+= -lpam
|
||||||
|
.endif
|
||||||
|
|
||||||
.include "../Makefile.inc"
|
.include "../Makefile.inc"
|
||||||
|
Loading…
Reference in New Issue
Block a user