CVS commit: pkgsrc/mk/buildlink3

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Jun 14 11:25:59 UTC 2023

Modified Files:
        pkgsrc/mk/buildlink3: bsd.buildlink3.mk

Log Message:
buildlink3: Test existence of files in the cross destdir.

Files outside it are never relevant to buildlink3.

No change for native compiilation, where ${_CROSS_DESTDIR:U} is
empty.


To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 pkgsrc/mk/buildlink3/bsd.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/buildlink3/bsd.buildlink3.mk
diff -u pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.259 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.260
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.259        Thu Jun  8 22:59:38 2023
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk      Wed Jun 14 11:25:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.259 2023/06/08 22:59:38 riastradh Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.260 2023/06/14 11:25:59 riastradh Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -346,12 +346,12 @@ _BLNK_PKG_DBDIR.${_pkg_}?=        _BLNK_PKG_DBD
 _BLNK_PKG_INFO.${_pkg_}?=      ${TRUE}
 BUILDLINK_PKGNAME.${_pkg_}?=   ${_pkg_}
 # Usual systems has builtin packages in /usr
-.    if exists(/usr)
+.    if exists(${_CROSS_DESTDIR:U}/usr)
 BUILDLINK_PREFIX.${_pkg_}?=    /usr
 # Haiku OS has posix packages in /boot/sytem/develop (or /boot/common)
-.    elif exists(/boot/system/develop)
+.    elif exists(${_CROSS_DESTDIR:U}/boot/system/develop)
 BUILDLINK_PREFIX.${_pkg_}?=    /boot/system/develop
-.    elif exists(/boot/common)
+.    elif exists(${_CROSS_DESTDIR:U}/boot/common)
 BUILDLINK_PREFIX.${_pkg_}?=    /boot/common
 .    else
 # XXX: elsewhere?
@@ -464,7 +464,7 @@ BUILDLINK_LIBS+=    ${_flag_}
      !empty(BUILDLINK_AUTO_DIRS.${_pkg_}:M[yY][eE][sS])
 .  if !empty(BUILDLINK_INCDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_INCDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
-.      if exists(${_dir_})
+.      if exists(${_CROSS_DESTDIR:U}${_dir_})
 .        if empty(BUILDLINK_CPPFLAGS:M-I${_dir_})
 BUILDLINK_CPPFLAGS+=   -I${_dir_}
 .        endif
@@ -473,7 +473,7 @@ BUILDLINK_CPPFLAGS+=        -I${_dir_}
 .  endif
 .  if !empty(BUILDLINK_LIBDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_LIBDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
-.      if exists(${_dir_})
+.      if exists(${_CROSS_DESTDIR:U}${_dir_})
 .        if empty(BUILDLINK_LDFLAGS:M-L${_dir_})
 BUILDLINK_LDFLAGS+=    -L${_dir_}
 .        endif
@@ -482,7 +482,7 @@ BUILDLINK_LDFLAGS+= -L${_dir_}
 .  endif
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
-.      if exists(${_dir_})
+.      if exists(${_CROSS_DESTDIR:U}${_dir_})
 .        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
 BUILDLINK_LDFLAGS+=    ${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
@@ -499,7 +499,7 @@ BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLA
 .for _pkg_ in ${_BLNK_PACKAGES}
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${LOCALBASE}\//}
-.      if exists(${_dir_})
+.      if exists(${_CROSS_DESTDIR:U}${_dir_})
 .        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
 BUILDLINK_LDFLAGS+=    ${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
@@ -881,7 +881,7 @@ _CWRAPPERS_TRANSFORM+=      I:${_dir_}/:
 .for _pkg_ in ${_BLNK_PACKAGES}
 .  if !empty(BUILDLINK_LIBDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_LIBDIRS.${_pkg_}}
-.      if exists(${BUILDLINK_PREFIX.${_pkg_}}/${_dir_})
+.      if exists(${_CROSS_DESTDIR:U}${BUILDLINK_PREFIX.${_pkg_}}/${_dir_})
 _BLNK_PASSTHRU_RPATHDIRS+=     ${BUILDLINK_PREFIX.${_pkg_}}/${_dir_}
 .      endif
 .    endfor