From owner-p4-projects@FreeBSD.ORG  Mon Oct 30 15:53:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C13D16A494; Mon, 30 Oct 2006 15:53:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 309AF16A416
	for <perforce@freebsd.org>; Mon, 30 Oct 2006 15:53:06 +0000 (UTC)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 457EB43D69
	for <perforce@freebsd.org>; Mon, 30 Oct 2006 15:53:05 +0000 (GMT)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9UFr5I0062659
	for <perforce@freebsd.org>; Mon, 30 Oct 2006 15:53:05 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9UFr4Gi062656
	for perforce@freebsd.org; Mon, 30 Oct 2006 15:53:04 GMT
	(envelope-from bushman@freebsd.org)
Date: Mon, 30 Oct 2006 15:53:04 GMT
Message-Id: <200610301553.k9UFr4Gi062656@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bushman@freebsd.org using -f
From: Michael Bushkov <bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108758 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2006 15:53:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=108758

Change 108758 by bushman@bushman_nss_ldap_cached on 2006/10/30 15:52:46

	+ ${PICFLAG} added to build on amd64. I wonder if it is correct on other platforms - needs checking
	+ 2 minor fixes

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/Makefile#8 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/Makefile#3 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#5 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libnssutil/Makefile#8 (text+ko) ====

@@ -3,6 +3,7 @@
 LIB=	nssutil
 SRCS=	copynetent.c copyhtent.c gr_scan.c pw_scan.c rpcunpack.c\
 	servunpack.c
+CFLAGS+=        ${PICFLAG}
 INTERNALLIB=
 
 .include <bsd.lib.mk>

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/Makefile#3 (text+ko) ====

@@ -22,7 +22,7 @@
 .endif
 
 # Needed to use __pw_scan function, which is in libnssutil
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libutil
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libnssutil
 LD_ADD+= -lnssutil
 LDFLAGS+= -L${.OBJDIR}/../libnssutil
 

==== //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#5 (text+ko) ====

@@ -368,7 +368,7 @@
     BIND_LIBS \
     HESIOD \
     IDEA \
-    NSS_ICMP \
+    NSS_ICMP
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif