diff options
| author | rin <rin@NetBSD.org> | 2020-05-23 00:43:33 +0000 |
|---|---|---|
| committer | rin <rin@NetBSD.org> | 2020-05-23 00:43:33 +0000 |
| commit | 8dc58f5ad08dce3e4e93c2267ddc31c052fcbcfe (patch) | |
| tree | c90aaa86523179ec36d21c5c18ee57f209a0c0ae /lib/libpam | |
| parent | a73a5ec213b87ced83e93bfca5f55aedcc721662 (diff) | |
Fix fallout from NO_STATIC_MODULES -> OPENPAM_STATIC_MODULES changes;
libpam.a fails to load any modules and does not work at all.
At the moment, openpam_load.c at least must be compiled with and without
OPENPAM_STATIC_MODULES for static and shared libraries, respectively.
Therefore, use CSHLIBFLAGS again, in order to build objects for static and
shared libraries separately.
This may be ugly, but seems better for me than adding further hacks in
libpam/libpam/Makefile, which is already complicated enough...
Diffstat (limited to 'lib/libpam')
| -rw-r--r-- | lib/libpam/Makefile.inc | 8 | ||||
| -rw-r--r-- | lib/libpam/libpam/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpam/modules/mod.mk | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc index 7c051ea043b..8d3de2fea57 100644 --- a/lib/libpam/Makefile.inc +++ b/lib/libpam/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.19 2020/04/29 02:16:56 riastradh Exp $ +# $NetBSD: Makefile.inc,v 1.20 2020/05/23 00:43:33 rin Exp $ # Copyright 1998 Juniper Networks, Inc. # All rights reserved. # @@ -42,6 +42,12 @@ CPPFLAGS+= -DOPENPAM_MODULES_DIRECTORY=\"${MODLIBDIR}\" # No debugging #CPPFLAGS+= -DDEBUG +# XXX +# At the moment, openpam_load.c at least must be compiled with and without +# OPENPAM_STATIC_MODULES for static and shared libraries, respectively. +CPPFLAGS+= -DOPENPAM_STATIC_MODULES +CSHLIBFLAGS+= -UOPENPAM_STATIC_MODULES + # Define the shared library version here. libpam and the modules share a # version, and we need these variables early for module install rules. SHLIB_MAJOR= 4 diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index 0e478056593..8ff0cc4f0ac 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2020/05/01 21:58:16 christos Exp $ +# $NetBSD: Makefile,v 1.26 2020/05/23 00:43:33 rin Exp $ #- # Copyright (c) 1998 Juniper Networks, Inc. # All rights reserved. @@ -214,8 +214,6 @@ openpam_static_modules.o: openpam_static.o ${STATIC_MODULE_LIBS} ${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \ openpam_static.o ${STATIC_MODULE_LIBS} -CPPFLAGS.openpam_static.c+= -DOPENPAM_STATIC_MODULES - CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare COPTS.openpam_dynamic.c+= ${GCC_NO_CAST_FUNCTION_TYPE} diff --git a/lib/libpam/modules/mod.mk b/lib/libpam/modules/mod.mk index 989dec0c253..18aa6b45c67 100644 --- a/lib/libpam/modules/mod.mk +++ b/lib/libpam/modules/mod.mk @@ -1,4 +1,4 @@ -# $NetBSD: mod.mk,v 1.16 2020/04/29 02:16:57 riastradh Exp $ +# $NetBSD: mod.mk,v 1.17 2020/05/23 00:43:33 rin Exp $ NOLINT= # don't build a lint library NOPROFILE= # don't build a profile library @@ -21,7 +21,6 @@ LIBDPLIBS+= pam ${NETBSDSRCDIR}/lib/libpam/libpam libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR} .else libinstall:: -CPPFLAGS+= -DOPENPAM_STATIC_MODULES .endif .include <bsd.lib.mk> |
