pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Fixes for shlib handling on AIX



details:   https://anonhg.NetBSD.org/pkgsrc/rev/95055946275d
branches:  trunk
changeset: 491730:95055946275d
user:      garbled <garbled%pkgsrc.org@localhost>
date:      Tue Mar 29 08:17:42 2005 +0000

description:
Fixes for shlib handling on AIX

diffstat:

 mk/bsd.pkg.mk      |  7 ++-----
 mk/platform/AIX.mk |  5 ++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 580cb11983f3 -r 95055946275d mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Mar 29 07:15:52 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue Mar 29 08:17:42 2005 +0000
@@ -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 @@
                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 @@
                                ${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 -r 580cb11983f3 -r 95055946275d mk/platform/AIX.mk
--- a/mk/platform/AIX.mk        Tue Mar 29 07:15:52 2005 +0000
+++ b/mk/platform/AIX.mk        Tue Mar 29 08:17:42 2005 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index