From af5c83a7301594af2b60728493497e68aee725a3 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 11 Mar 2004 22:57:22 +0000 Subject: Get rid of all occurrences of cpp-like tests for ${OPSYS} in bsd.pkg.mk, and use the abstracted means of determining generic shared lib type per operating system. --- mk/bsd.pkg.mk | 12 ++++-------- mk/defs.AIX.mk | 3 ++- mk/defs.BSDOS.mk | 3 ++- mk/defs.Darwin.mk | 3 ++- mk/defs.FreeBSD.mk | 3 ++- mk/defs.IRIX.mk | 3 ++- mk/defs.Interix.mk | 3 ++- mk/defs.Linux.mk | 3 ++- mk/defs.NetBSD.mk | 3 ++- mk/defs.OpenBSD.mk | 3 ++- mk/defs.SunOS.mk | 3 ++- 11 files changed, 24 insertions(+), 18 deletions(-) (limited to 'mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 547b433de38..f2dd204a769 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1419 2004/03/11 21:19:00 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1420 2004/03/11 22:57:22 agc Exp $ # # This file is in the public domain. # @@ -3073,13 +3073,7 @@ check-shlibs: show-shlib-type: . if empty(USE_LANGUAGES) ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "none" -. elif exists(/usr/lib/libc.dylib) - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "dylib" -. elif ${OPSYS} == "AIX" - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "aixlib" -. elif ${OPSYS} == "Interix" - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "ELF" # not really, but acts like it -. else +. elif ${_OPSYS_SHLIB_TYPE} == "ELF/a.out" ${_PKG_SILENT}${_PKG_DEBUG} \ cd ${WRKDIR} && \ sotype=none; \ @@ -3098,6 +3092,8 @@ show-shlib-type: fi; \ ${ECHO} "$$sotype"; \ ${RM} -f a.$$$$.c a.$$$$.out +. else + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${_OPSYS_SHLIB_TYPE} . endif # USE_LANGUAGES .endif diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk index 707c848a9f7..77271f926a2 100644 --- a/mk/defs.AIX.mk +++ b/mk/defs.AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.AIX.mk,v 1.4 2004/01/27 16:11:47 agc Exp $ +# $NetBSD: defs.AIX.mk,v 1.5 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the AIX operating system. @@ -153,6 +153,7 @@ _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= aixlib # type of shared lib _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk index 06adaf318d5..287d03fcc9a 100644 --- a/mk/defs.BSDOS.mk +++ b/mk/defs.BSDOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.BSDOS.mk,v 1.5 2004/01/27 16:11:47 agc Exp $ +# $NetBSD: defs.BSDOS.mk,v 1.6 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the BSD/OS operating system. @@ -139,6 +139,7 @@ _OPSYS_LIBTOOL_REQD= 1.4.20010614nb18 # base version of libtool required _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 3e4a9ca20d7..0a00a55b8c6 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.65 2004/01/27 16:11:47 agc Exp $ +# $NetBSD: defs.Darwin.mk,v 1.66 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the Darwin operating system. @@ -122,6 +122,7 @@ _OPSYS_LIBTOOL_REQD= 1.4.20010614nb16 # base version of libtool required _OPSYS_PERL_REQD= 5.8.0 # base version of perl required _OPSYS_PTHREAD_AUTO= yes # -lpthread not needed for pthreads _OPSYS_RPATH_NAME= -L # darwin has no rpath, use -L instead +_OPSYS_SHLIB_TYPE= dylib # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index 3b045935dd8..2e20eda822f 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.32 2004/03/09 10:34:31 xtraeme Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.33 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the FreeBSD operating system. @@ -140,6 +140,7 @@ _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index 58004679e0b..f2ece5a9212 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.40 2004/01/27 16:11:47 agc Exp $ +# $NetBSD: defs.IRIX.mk,v 1.41 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the IRIX operating system. @@ -132,6 +132,7 @@ _OPSYS_NEEDS_XPKGWEDGE= yes # xpkgwedge is required for X11 _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -rpath, # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type .if defined(_OPSYS_GPATCH_REQD) && ${_OPSYS_GPATCH_REQD} == "YES" _PATCH_CAN_BACKUP= yes # patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk index 1f69fc483b3..cc0fd13430d 100644 --- a/mk/defs.Interix.mk +++ b/mk/defs.Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Interix.mk,v 1.5 2004/03/11 21:18:32 tv Exp $ +# $NetBSD: defs.Interix.mk,v 1.6 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the Interix operating system. @@ -123,6 +123,7 @@ _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF # shared lib type - not exactly true, but near enough _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 11ab1d90dc9..61a44466a23 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.65 2004/01/31 16:52:16 xtraeme Exp $ +# $NetBSD: defs.Linux.mk,v 1.66 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the Linux operating system. @@ -175,6 +175,7 @@ _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 8c7314ce745..b41abd519a6 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.60 2004/01/31 16:52:16 xtraeme Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.61 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the NetBSD operating system. @@ -139,6 +139,7 @@ _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= cat # directory where catman pages are diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index c45cde072c7..7107d31b4ae 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.28 2004/01/27 16:11:47 agc Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.29 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the OpenBSD operating system. @@ -127,6 +127,7 @@ _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups .if ${OS_VERSION} >= 3.4 _PATCH_BACKUP_ARG?= -V simple -z # switch to patch(1) for backup suffix diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 3dee5504599..2609287a9a1 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.80 2004/02/14 03:26:09 grant Exp $ +# $NetBSD: defs.SunOS.mk,v 1.81 2004/03/11 22:57:22 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -126,6 +126,7 @@ _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_RPATH_NAME= -R # name of symbol in rpath directive to linker +_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= man # directory where catman pages are -- cgit v1.2.3