CVS commit: pkgsrc/mk/buildlink3

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Jun  8 22:59:38 UTC 2023

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

Log Message:
buildlink3: Fix missing CROSS_DESTDIR qualifier for cd.

Not clear why this didn't fail noisily, but it had the effect of just
not creating the appropriate buildlink3 symlinks if the library in
question wasn't installed natively too.


To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 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.258 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.259
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.258        Tue Jan 24 14:31:47 2023
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk      Thu Jun  8 22:59:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.258 2023/01/24 14:31:47 wiz Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.259 2023/06/08 22:59:38 riastradh Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -670,7 +670,7 @@ ${_BLNK_COOKIE.${_pkg_}}:
        *)              buildlink_dir="${BUILDLINK_DIR}" ;;             \
        esac;                                                           \
        [ -z "${BUILDLINK_PREFIX.${_pkg_}:Q}" ] ||                      \
-       cd ${BUILDLINK_PREFIX.${_pkg_}} &&                              \
+       cd ${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}} &&             \
        ${_BLNK_FILES_CMD.${_pkg_}} |                                   \
        while read file; do                                             \
                src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \
@@ -710,7 +710,7 @@ ${_BLNK_COOKIE.${_pkg_}}:
        *)              buildlink_dir="${BUILDLINK_DIR}" ;;             \
        esac;                                                           \
        [ -z "${BUILDLINK_PREFIX.${_pkg_}:Q}" ] ||                      \
-       cd ${BUILDLINK_PREFIX.${_pkg_}} &&                              \
+       cd ${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}} &&             \
        ${_BLNK_FILES_CMD.${_pkg_}} |                                   \
        while read file; do                                             \
                src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \