[src/trunk]: src/lib/libpam/modules Link with libraries from the source build...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/lib/libpam/modules Link with libraries from the source build...
From: christos <christos%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 16:06:21 +0000

details:   https://anonhg.NetBSD.org/src/rev/419b1fc7abab
branches:  trunk
changeset: 572296:419b1fc7abab
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Dec 29 04:16:17 2004 +0000

description:
Link with libraries from the source build directory.

diffstat:

 lib/libpam/modules/mod.mk               |  17 ++++++++++++++++-
 lib/libpam/modules/pam_krb5/Makefile    |   4 ++--
 lib/libpam/modules/pam_ksu/Makefile     |   4 ++--
 lib/libpam/modules/pam_lastlog/Makefile |   4 ++--
 lib/libpam/modules/pam_nologin/Makefile |   4 ++--
 lib/libpam/modules/pam_radius/Makefile  |   4 ++--
 lib/libpam/modules/pam_ssh/Makefile     |   4 ++--
 lib/libpam/modules/pam_unix/Makefile    |   4 ++--
 8 files changed, 30 insertions(+), 15 deletions(-)

diffs (151 lines):

diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/mod.mk
--- a/lib/libpam/modules/mod.mk Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/mod.mk Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mod.mk,v 1.2 2004/12/29 00:08:14 thorpej Exp $
+#      $NetBSD: mod.mk,v 1.3 2004/12/29 04:16:17 christos Exp $
 
 NOLINT=                # don't build a lint library
 NOPROFILE=     # don't build a profile library
@@ -14,6 +14,21 @@
 .PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
 libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
 
+LIB_ROOT_DIR= ${.CURDIR}/../../..
+
+LIBUTILDIR!=  cd ${LIB_ROOT_DIR}/libutil; ${PRINTOBJDIR}
+LIBCRYPTDIR!=  cd ${LIB_ROOT_DIR}/libcrypt; ${PRINTOBJDIR}
+LIBRPCSVCDIR!=  cd ${LIB_ROOT_DIR}/librpcsvc; ${PRINTOBJDIR}
+
+.if (${MKKERBEROS} != "no")
+LIBCRYPTODIR!=  cd ${LIB_ROOT_DIR}/libcrypto; ${PRINTOBJDIR}
+LIBASN1DIR!=  cd ${LIB_ROOT_DIR}/libasn1; ${PRINTOBJDIR}
+LIBROKENDIR!=  cd ${LIB_ROOT_DIR}/libroken; ${PRINTOBJDIR}
+LIBCOM_ERRDIR!=  cd ${LIB_ROOT_DIR}/libcom_err; ${PRINTOBJDIR}
+LIBKRB5DIR!=  cd ${LIB_ROOT_DIR}/libkrb5; ${PRINTOBJDIR}
+.endif
+
+
 .include <bsd.lib.mk>
 
 ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}: lib${LIB}.so.${SHLIB_FULLVERSION}
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_krb5/Makefile
--- a/lib/libpam/modules/pam_krb5/Makefile      Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_krb5/Makefile      Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:45 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # Copyright 2001 FreeBSD, Inc.
 # All rights reserved.
 #
@@ -30,6 +30,6 @@
 MAN=   pam_krb5.8
 
 DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO}
-LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
+LDADD= -Wl,-L${LIBKRB5DIR}:${LIBASN1DIR}:${LIBROKENDIR}:${LIBCOM_ERRDIR}:${LIBCRYPTDIR}:${LIBCRYPTODIR} -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
 
 .include "${.CURDIR}/../mod.mk"
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_ksu/Makefile
--- a/lib/libpam/modules/pam_ksu/Makefile       Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_ksu/Makefile       Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:45 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # Copyright 2002 FreeBSD, Inc.
 # All rights reserved.
 #
@@ -30,6 +30,6 @@
 MAN=   pam_ksu.8
 
 DPADD= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO}
-LDADD= -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
+LDADD= -Wl-L${LIBKRB5DIR}:${LIBASN1DIR}:${LIBROKENDIR}:${LIBCOM_ERRDIR}:${LIBCRYPTDIR}:${LIBCRYPTODIR} -lkrb5 -lasn1 -lroken -lcom_err -lcrypt -lcrypto
 
 .include "${.CURDIR}/../mod.mk"
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_lastlog/Makefile
--- a/lib/libpam/modules/pam_lastlog/Makefile   Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_lastlog/Makefile   Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:46 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # Copyright 2001 Mark R V Murray
 # All rights reserved.
 #
@@ -30,6 +30,6 @@
 MAN=   pam_lastlog.8
 
 DPADD= ${LIBUTIL}
-LDADD= -lutil
+LDADD= -Wl,-L${LIBUTILDIR} -lutil
 
 .include "${.CURDIR}/../mod.mk"
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_nologin/Makefile
--- a/lib/libpam/modules/pam_nologin/Makefile   Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_nologin/Makefile   Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:46 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # Copyright 2001 Mark R V Murray
 # All rights reserved.
 #
@@ -30,6 +30,6 @@
 MAN=   pam_nologin.8
 
 DPADD= ${LIBUTIL}
-LDADD= -lutil
+LDADD= -Wl,-L${LIBUTILDIR} -lutil
 
 .include "${.CURDIR}/../mod.mk"
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_radius/Makefile
--- a/lib/libpam/modules/pam_radius/Makefile    Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_radius/Makefile    Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:46 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # Copyright 1998 Juniper Networks, Inc.
 # All rights reserved.
 #
@@ -31,6 +31,6 @@
 WARNS= 0
 
 DPADD= ${LIBRADIUS}
-LDADD= -lradius
+LDADD= -Wl,-L${LIBRADIUSDIR} -lradius
 
 .include "${.CURDIR}/../mod.mk"
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_ssh/Makefile
--- a/lib/libpam/modules/pam_ssh/Makefile       Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_ssh/Makefile       Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:47 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # PAM module for SSH
 # $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
 
@@ -14,6 +14,6 @@
 
 # This does not work yet because we don't have libssh.
 DPADD= ${LIBCRYPTO} ${LIBCRYPT}
-LDADD= -lcrypto -lcrypt
+LDADD= -Wl,-L${LIBCRYPTODIR}:${LIBCRYPTDIR} -lcrypto -lcrypt
 
 .include "${.CURDIR}/../mod.mk"
diff -r e1fe6fa10144 -r 419b1fc7abab lib/libpam/modules/pam_unix/Makefile
--- a/lib/libpam/modules/pam_unix/Makefile      Wed Dec 29 02:11:31 2004 +0000
+++ b/lib/libpam/modules/pam_unix/Makefile      Wed Dec 29 04:16:17 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:47 christos Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/29 04:16:17 christos Exp $
 # Copyright 1998 Juniper Networks, Inc.
 # All rights reserved.
 # Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -42,7 +42,7 @@
 MAN=   pam_unix.8
 
 DPADD= ${LIBUTIL} ${LIBCRYPT}
-LDADD= -lutil -lcrypt
+LDADD= -Wl,-L${LIBUTILDIR}:${LIBCRYPTDIR} -lutil -lcrypt
 
 .if (${USE_YP} != "no")
 CPPFLAGS+= -DYP

Prev by Date: [src/trunk]: src/sys/arch/sgimips/hpc Remove the static sq_trace array and ma...
Next by Date: [src/trunk]: src/sys/arch/arm/include/arm32 Bump UPAGES back down to 8KB now ...
Previous by Thread: [src/trunk]: src/sys/arch/sgimips/hpc Remove the static sq_trace array and ma...
Next by Thread: [src/trunk]: src/sys/arch/arm/include/arm32 Bump UPAGES back down to 8KB now ...
Indexes:

Home | Main Index | Thread Index | Old Index