[pkgsrc/trunk]: pkgsrc/mk Append ${ABI} to some lib-dirs. This is a no-op on...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d31ddb25f89
branches:  trunk
changeset: 476159:0d31ddb25f89
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Fri Jun 04 15:00:14 2004 +0000

description:
Append ${ABI} to some lib-dirs.  This is a no-op on systems that do not
use ABI, but allows IRIX and particularly IRIX64 to find the correct libraries
especially when linking against X11 libs.  Tested over several months and
multiple bulk-builds.

diffstat:

 mk/bsd.pkg.mk                   |   8 ++++----
 mk/buildlink3/bsd.buildlink3.mk |  14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (73 lines):

diff -r a432a7299135 -r 0d31ddb25f89 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Jun 04 14:48:59 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Jun 04 15:00:14 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1466 2004/06/04 13:45:26 xtraeme Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1467 2004/06/04 15:00:14 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -440,8 +440,8 @@
 DISTINFO_FILE?=                ${.CURDIR}/distinfo
 
 .if defined(USE_X11)
-X11_LDFLAGS+=          -Wl,${RPATH_FLAG}${X11BASE}/lib
-X11_LDFLAGS+=          -L${X11BASE}/lib
+X11_LDFLAGS+=          -Wl,${RPATH_FLAG}${X11BASE}/lib${ABI}
+X11_LDFLAGS+=          -L${X11BASE}/lib${ABI}
 .endif
 .if !empty(USE_BUILDLINK2:M[nN][oO]) && !empty(USE_BUILDLINK3:M[nN][oO])
 LDFLAGS+=              -Wl,${RPATH_FLAG}${LOCALBASE}/lib
@@ -1081,7 +1081,7 @@
 HAS_CONFIGURE=         yes
 .  if defined(USE_X11)
 CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
-CONFIGURE_ARGS+=        --x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS+=        --x-libraries=${X11BASE}/lib${ABI}
 .  endif
 CONFIGURE_HAS_INFODIR?=        yes
 .  if !empty(INFO_FILES) && !empty(CONFIGURE_HAS_INFODIR:M[yY][eE][sS])
diff -r a432a7299135 -r 0d31ddb25f89 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Fri Jun 04 14:48:59 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Fri Jun 04 15:00:14 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.143 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.144 2004/06/04 15:00:15 jschauma Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -358,7 +358,7 @@
 BUILDLINK_CPPFLAGS.${_pkg_}?=  # empty
 BUILDLINK_LDFLAGS.${_pkg_}?=   # empty
 BUILDLINK_INCDIRS.${_pkg_}?=   include
-BUILDLINK_LIBDIRS.${_pkg_}?=   lib
+BUILDLINK_LIBDIRS.${_pkg_}?=   lib${ABI}
 .  if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull)
 BUILDLINK_RPATHDIRS.${_pkg_}?= ${BUILDLINK_LIBDIRS.${_pkg_}}
 .  else
@@ -458,12 +458,12 @@
 # uses X11.
 #
 .if defined(USE_X11)
-.  if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib)
-BUILDLINK_LDFLAGS+=    -L${X11BASE}/lib
+.  if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib${ABI})
+BUILDLINK_LDFLAGS+=    -L${X11BASE}/lib${ABI}
 .  endif
 .  if (${_USE_RPATH} == "yes") && \
-      empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib)
-BUILDLINK_LDFLAGS+=    ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+      empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI})
+BUILDLINK_LDFLAGS+=    ${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI}
 .  endif
 .endif
 
@@ -509,7 +509,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
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${ABI}
 
 # Create the saved variables Makefile fragment to pass variables through
 # to sub-make processes invoked on the same Makefile.