From owner-p4-projects@FreeBSD.ORG  Fri Aug  3 15:33:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF07B16A421; Fri,  3 Aug 2007 15:33:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F4DA16A41F
	for <perforce@FreeBSD.org>; Fri,  3 Aug 2007 15:33:55 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 694BE13C4A3
	for <perforce@FreeBSD.org>; Fri,  3 Aug 2007 15:33:55 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l73FXtPq007059
	for <perforce@FreeBSD.org>; Fri, 3 Aug 2007 15:33:55 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l73FXsMl007054
	for perforce@freebsd.org; Fri, 3 Aug 2007 15:33:54 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Fri, 3 Aug 2007 15:33:54 GMT
Message-Id: <200708031533.l73FXsMl007054@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124599 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: Fri, 03 Aug 2007 15:33:56 -0000

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

Change 124599 by gonzo@gonzo_jeeves on 2007/08/03 15:33:04

	o Use NO_STATIC_MODULES to check the dynamic build case.
	    We use -mabicalls (which assumes -fpic since 
	    4.2 import) for both static and dynamic builds.

Affected files ...

.. //depot/projects/mips2/src/contrib/openpam/include/security/openpam.h#2 edit
.. //depot/projects/mips2/src/lib/libpam/Makefile.inc#3 edit

Differences ...

==== //depot/projects/mips2/src/contrib/openpam/include/security/openpam.h#2 (text) ====

@@ -290,7 +290,8 @@
 #define NO_STATIC_MODULES
 #endif
 #endif
-#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES)
+#if defined(__GNUC__)
+#if !defined(NO_STATIC_MODULES)
 /* gcc, static linking */
 #include <sys/cdefs.h>
 #include <linker_set.h>
@@ -308,6 +309,7 @@
 #define PAM_EXTERN
 #define PAM_MODULE_ENTRY(name)
 #endif
+#endif
 
 #ifdef __cplusplus
 }

==== //depot/projects/mips2/src/lib/libpam/Makefile.inc#3 (text+ko) ====

@@ -28,5 +28,10 @@
 DEBUG_FLAGS+=	-DDEBUG
 .endif
 
+# Specify dynamic linking explicitly, instead of using check whether 
+# __PIC__ is defined or not. MIPS -mabicalls assumes -fpic and -mabicalls
+# flag is used for both static and dynamic libraries.
+PICFLAG+=	-DNO_STATIC_MODULES
+
 SHLIB_MAJOR=	4
 PAM_MOD_DIR=	${LIBDIR}