diff options
| author | agc <agc> | 1998-07-14 15:53:54 +0000 |
|---|---|---|
| committer | agc <agc> | 1998-07-14 15:53:54 +0000 |
| commit | 137326a36fbc4590e2e81a81fab99a667855e0d1 (patch) | |
| tree | 4f70f826cfe4de438903d027c6be58590de39322 /mk | |
| parent | eb513096b00ee7d2e12edbeee377a020d38d3992 (diff) | |
| download | pkgsrc-137326a36fbc4590e2e81a81fab99a667855e0d1.tar.gz | |
Fill in SHLIB_TYPE in the pkgsrc copy of bsd.own.mk. Use this value
in bsd.pkg.mk to work out the type of shared objects when doing
automatic shared object handling (ELF, a.out or none).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.own.mk | 9 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 18 |
2 files changed, 21 insertions, 6 deletions
diff --git a/mk/bsd.own.mk b/mk/bsd.own.mk index 45f5a6e01a3..5ac5b901b6c 100644 --- a/mk/bsd.own.mk +++ b/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.4 1998/05/29 13:57:09 agc Exp $ +# $NetBSD: bsd.own.mk,v 1.5 1998/07/14 15:53:54 agc Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -117,6 +117,13 @@ OBJECT_FMT?=ELF OBJECT_FMT?=a.out .endif +.if (${MACHINE_ARCH} == "vax") || \ + (${MACHINE_ARCH} == "powerpc") +SHLIB_TYPE?= "" +.else +SHLIB_TYPE?= ${OBJECT_FMT} +.endif + # No lint, for now. # all machines on which we are okay should be added here until we can diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9b94334bc3b..3c08d10ae1b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.117 1998/07/14 11:36:11 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.118 1998/07/14 15:53:54 agc Exp $ # # This file is in the public domain. # @@ -1073,8 +1073,9 @@ _PORT_USE: .USE '^([^/]*/)*lib/lib[^.]+\.so\.[0-9]+\.[0-9]+$$' \ ${PLIST} || /usr/bin/true`; \ if [ X"$$sos" != X"" ]; then \ - ${ECHO_MSG} "===> [Automatic shared object handling]";\ - if [ ${OBJECT_FMT} = "ELF" ]; then \ + case ${SHLIB_TYPE} in \ + "ELF") \ + ${ECHO_MSG} "===> [Automatic ${SHLIB_TYPE} shared object handling]";\ for so in $$sos; do \ so1=`${ECHO} $$so | ${SED} -e 's|\.[0-9]*$$||'`; \ so2=`${ECHO} $$so1 | ${SED} -e 's|\.[0-9]*$$||'`; \ @@ -1096,7 +1097,9 @@ _PORT_USE: .USE ${ECHO_MSG} "$$so"; \ fi; \ done \ - else \ + ;; \ + "a.out") \ + ${ECHO_MSG} "===> [Automatic ${SHLIB_TYPE} shared object handling]";\ case `${GREP} -c '^@exec ${LDCONFIG}$$' ${PLIST}` in \ 0) \ ${ECHO} "@exec ${LDCONFIG}" >> ${PLIST}; \ @@ -1104,10 +1107,15 @@ _PORT_USE: .USE ;; \ esac; \ if [ X"${PKG_VERBOSE}" != X"" ]; then \ + ${ECHO_MSG} "$$sos"; \ ${ECHO_MSG} "${LDCONFIG}"; \ fi; \ ${LDCONFIG}; \ - fi; \ + ;; \ + *) \ + ${ECHO_MSG} "No shared libraries for ${MACHINE_ARCH}"; \ + ;; \ + esac; \ fi) .if exists(${PKGDIR}/MESSAGE) @${ECHO_MSG} "===> Please note the following:" |