Sun Dec 14 16:34:24 2008 UTC ()
Add /usr/lib${LIBABISUFFIX} to the search path


(jmcneill)
diff -r1.3 -r1.4 pkgsrc/mk/buildlink3/find-libs.mk
cvs diff -r1.3 -r1.4 pkgsrc/mk/buildlink3/find-libs.mk (expand / switch to unified diff)

--- pkgsrc/mk/buildlink3/find-libs.mk 2005/07/15 18:27:55 1.3
+++ pkgsrc/mk/buildlink3/find-libs.mk 2008/12/14 16:34:24 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: find-libs.mk,v 1.3 2005/07/15 18:27:55 jlam Exp $ 1# $NetBSD: find-libs.mk,v 1.4 2008/12/14 16:34:24 jmcneill Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -56,19 +56,21 @@ @@ -56,19 +56,21 @@
56USE_TOOLS+= echo 56USE_TOOLS+= echo
57.endif 57.endif
58.if empty(USE_TOOLS:Mtest) 58.if empty(USE_TOOLS:Mtest)
59USE_TOOLS+= test 59USE_TOOLS+= test
60.endif 60.endif
61 61
62.for _lib_ in ${BUILTIN_FIND_LIBS} 62.for _lib_ in ${BUILTIN_FIND_LIBS}
63. if !defined(BUILTIN_LIB_FOUND.${_lib_}) 63. if !defined(BUILTIN_LIB_FOUND.${_lib_})
64BUILTIN_LIB_FOUND.${_lib_}!= \ 64BUILTIN_LIB_FOUND.${_lib_}!= \
65 if ${TEST} "`${ECHO} /usr/lib${ABI}/lib${_lib_}.*`" != "/usr/lib${ABI}/lib${_lib_}.*"; then \ 65 if ${TEST} "`${ECHO} /usr/lib${ABI}/lib${_lib_}.*`" != "/usr/lib${ABI}/lib${_lib_}.*"; then \
66 ${ECHO} yes; \ 66 ${ECHO} yes; \
67 elif ${TEST} "`${ECHO} /lib${ABI}/lib${_lib_}.*`" != "/lib${ABI}/lib${_lib_}.*"; then \ 67 elif ${TEST} "`${ECHO} /lib${ABI}/lib${_lib_}.*`" != "/lib${ABI}/lib${_lib_}.*"; then \
68 ${ECHO} yes; \ 68 ${ECHO} yes; \
 69 elif ${TEST} "`${ECHO} /usr/lib${LIBABISUFFIX}/lib${_lib}.*`" != "/usr/lib${LIBABISUFFIX}/lib${_lib_}.*"; then \
 70 ${ECHO} yes; \
69 else \ 71 else \
70 ${ECHO} no; \ 72 ${ECHO} no; \
71 fi 73 fi
72. endif 74. endif
73MAKEVARS+= BUILTIN_LIB_FOUND.${_lib_} 75MAKEVARS+= BUILTIN_LIB_FOUND.${_lib_}
74.endfor 76.endfor