diff options
| author | garbled <garbled> | 2005-03-29 08:17:42 +0000 |
|---|---|---|
| committer | garbled <garbled> | 2005-03-29 08:17:42 +0000 |
| commit | 32cd66dcecc3e0dbb7109837faffef55b23335d2 (patch) | |
| tree | 446b9bc07434fbc43203391165ea7df03b5cacb1 /mk | |
| parent | 3fab299f9d52d5ca6cb0fc2ef778d19f5076396f (diff) | |
| download | pkgsrc-32cd66dcecc3e0dbb7109837faffef55b23335d2.tar.gz | |
Fixes for shlib handling on AIX
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/platform/AIX.mk | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f155c3c2037..a3738f56f9a 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1604 2005/03/24 17:46:00 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1605 2005/03/29 08:17:42 garbled Exp $ # # This file is in the public domain. # @@ -2688,6 +2688,7 @@ do-shlib-handling: fi; \ case "$$shlib_type" in \ ELF) ;; \ + aixlib) ;; \ "a.out") \ ${AWK} '${_AOUT_AWK}' <${PLIST} >${PLIST}.tmp ; \ if [ "${SHLIB_PLIST_MODE}" = "1" ]; then \ @@ -2718,10 +2719,6 @@ do-shlib-handling: ${RM} ${PLIST}.tmp ; \ fi ; \ ;; \ - "aixlib") \ - ${AWK} '${_AIXLIB_AWK}' <${PLIST} >${PLIST}.tmp && \ - ${MV} ${PLIST}.tmp ${PLIST}; \ - ;; \ "*") \ if [ "${SHLIB_PLIST_MODE}" = "0" ]; then \ ${ECHO_MSG} "No shared libraries for ${MACHINE_ARCH}"; \ diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk index 3fd18fe2f9e..927ee102b49 100644 --- a/mk/platform/AIX.mk +++ b/mk/platform/AIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: AIX.mk,v 1.12 2005/03/18 18:16:35 tv Exp $ +# $NetBSD: AIX.mk,v 1.13 2005/03/29 08:17:42 garbled Exp $ # # Variable definitions for the AIX operating system. @@ -138,8 +138,7 @@ IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3 IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5 IMAKE_MANNEWSUFFIX= 0 -_DO_SHLIB_CHECKS= no # fixup PLIST for shared libs/run ldconfig - # doesn't work on AIX b/c no ldd. +_DO_SHLIB_CHECKS= yes _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake .if exists(/usr/include/netinet6) _OPSYS_HAS_INET6= yes # IPv6 is standard |