pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Add '/lib${LIBABISUFFIX}' to the search ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/482c853d9005
branches:  trunk
changeset: 602940:482c853d9005
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Mon Apr 23 08:44:00 2012 +0000

description:
Add '/lib${LIBABISUFFIX}' to the search path.

Also add a note
# XXX: Why are we looking in '/usr/lib${ABI}' and '/lib${ABI}', as we should
# XXX: only be looking in '/usr/lib${LIBABISUFFIX}' and '/lib${LIBABISUFFIX}'

diffstat:

 mk/buildlink3/find-libs.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r fc2fbe004cb9 -r 482c853d9005 mk/buildlink3/find-libs.mk
--- a/mk/buildlink3/find-libs.mk        Mon Apr 23 08:14:36 2012 +0000
+++ b/mk/buildlink3/find-libs.mk        Mon Apr 23 08:44:00 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: find-libs.mk,v 1.9 2010/08/21 05:07:51 obache Exp $
+# $NetBSD: find-libs.mk,v 1.10 2012/04/23 08:44:00 sbd Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -74,6 +74,8 @@
 .        endif
 .      endfor
 .    else
+# XXX: Why are we looking in '/usr/lib${ABI}' and '/lib${ABI}', as we should
+# XXX: only be looking in '/usr/lib${LIBABISUFFIX}' and '/lib${LIBABISUFFIX}'
 BUILTIN_LIB_FOUND.${_lib_}!=   \
        if ${TEST} "`${ECHO} /usr/lib${ABI}/lib${_lib_}.*`" != "/usr/lib${ABI}/lib${_lib_}.*"; then \
                ${ECHO} yes;                                            \
@@ -81,6 +83,8 @@
                ${ECHO} yes;                                            \
        elif ${TEST} "`${ECHO} /usr/lib${LIBABISUFFIX}/lib${_lib_}.*`" != "/usr/lib${LIBABISUFFIX}/lib${_lib_}.*"; then \
                ${ECHO} yes;                                            \
+       elif ${TEST} "`${ECHO} /lib${LIBABISUFFIX}/lib${_lib_}.*`" != "/lib${LIBABISUFFIX}/lib${_lib_}.*"; then \
+               ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \
        fi



Home | Main Index | Thread Index | Old Index