[pkgsrc/trunk]: pkgsrc/mk Introduce LIBABISUFFIX for platforms which require ...

[sketch <sketch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eff5e539f6b3
branches:  trunk
changeset: 483483:eff5e539f6b3
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Fri Nov 12 20:25:41 2004 +0000

description:
Introduce LIBABISUFFIX for platforms which require ABI-dependant library paths.

diffstat:

 mk/bsd.pkg.mk                   |  10 ++++++----
 mk/buildlink3/bsd.buildlink3.mk |  14 +++++++-------
 mk/platform/IRIX.mk             |   4 +++-
 3 files changed, 16 insertions(+), 12 deletions(-)

diffs (93 lines):

diff -r b37a90d36a45 -r eff5e539f6b3 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 12 20:18:27 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 12 20:25:41 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1535 2004/11/12 05:20:01 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1536 2004/11/12 20:25:41 sketch Exp $
 #
 # This file is in the public domain.
 #
@@ -433,9 +433,11 @@
 
 DISTINFO_FILE?=                ${.CURDIR}/distinfo
 
+LIBABISUFFIX?=
+
 .if defined(USE_X11)
-X11_LDFLAGS+=          ${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
-X11_LDFLAGS+=          -L${X11BASE}/lib${ABI}
+X11_LDFLAGS+=          ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
+X11_LDFLAGS+=          -L${X11BASE}/lib${LIBABISUFFIX}
 .endif
 .if !empty(USE_BUILDLINK3:M[nN][oO])
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
@@ -1106,7 +1108,7 @@
 HAS_CONFIGURE=         yes
 .  if defined(USE_X11)
 CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=        --x-libraries=${X11BASE}/lib${ABI}
+CONFIGURE_ARGS+=        --x-libraries=${X11BASE}/lib${LIBABISUFFIX}
 .  endif
 CONFIGURE_HAS_INFODIR?=        yes
 .  if !empty(INFO_FILES) && !empty(CONFIGURE_HAS_INFODIR:M[yY][eE][sS])
diff -r b37a90d36a45 -r eff5e539f6b3 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Fri Nov 12 20:18:27 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Fri Nov 12 20:25:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.160 2004/11/12 04:57:31 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.161 2004/11/12 20:25:41 sketch Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -348,7 +348,7 @@
 BUILDLINK_LDFLAGS.${_pkg_}?=   # empty
 BUILDLINK_LIBS.${_pkg_}?=      # empty
 BUILDLINK_INCDIRS.${_pkg_}?=   include
-BUILDLINK_LIBDIRS.${_pkg_}?=   lib${ABI}
+BUILDLINK_LIBDIRS.${_pkg_}?=   lib${LIBABISUFFIX}
 .  if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull)
 BUILDLINK_RPATHDIRS.${_pkg_}?= ${BUILDLINK_LIBDIRS.${_pkg_}}
 .  else
@@ -452,11 +452,11 @@
 # uses X11.
 #
 .if defined(USE_X11)
-.  if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib${ABI})
-BUILDLINK_LDFLAGS+=    -L${X11BASE}/lib${ABI}
+.  if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib${LIBABISUFFIX})
+BUILDLINK_LDFLAGS+=    -L${X11BASE}/lib${LIBABISUFFIX}
 .  endif
-.  if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI})
-BUILDLINK_LDFLAGS+=    ${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
+.  if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX})
+BUILDLINK_LDFLAGS+=    ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
 .  endif
 .endif
 
@@ -516,7 +516,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR}
 .endif
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${ABI}
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${LIBABISUFFIX}
 
 # The following variables are all optionally defined and control which
 # package files are symlinked into ${BUILDLINK_DIR} and how their names
diff -r b37a90d36a45 -r eff5e539f6b3 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Fri Nov 12 20:18:27 2004 +0000
+++ b/mk/platform/IRIX.mk       Fri Nov 12 20:25:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.2 2004/10/13 15:31:31 tv Exp $
+# $NetBSD: IRIX.mk,v 1.3 2004/11/12 20:25:41 sketch Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -165,6 +165,8 @@
 CONFIGURE_ENV+=                ABI=${ABI}
 MAKE_ENV+=             ABI=${ABI}
 
+LIBABISUFFIX=          ${ABI}
+
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 .if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)