Date: Fri, 3 Aug 2007 15:33:54 GMT From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 124599 for review Message-ID: <200708031533.l73FXsMl007054@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708031533.l73FXsMl007054>