CVS commit: pkgsrc/mk/buildlink3

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 10:40:09 UTC 2023

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

Log Message:
buildlink3: Transform ${CROSS_DESTDIR}${LOCALBASE} to BUIDLINK_DIR.

All gated on ${USE_CROSS_COMPILE:tl} == "yes", so no change to native
compilation.


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 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.260 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.261
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.260        Wed Jun 14 11:25:59 2023
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk      Tue Jun 27 10:40:09 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.260 2023/06/14 11:25:59 riastradh Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.261 2023/06/27 10:40:09 riastradh Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1052,9 +1052,15 @@ _CWRAPPERS_TRANSFORM+=   R:${_dir_}:${_dir
 # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
 #
 _BLNK_TRANSFORM+=      P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+_BLNK_TRANSFORM+=      P:${CROSS_DESTDIR}${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
+.endif
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=      P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _CWRAPPERS_TRANSFORM+= P:${LOCALBASE}:${BUILDLINK_DIR}
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+_CWRAPPERS_TRANSFORM+= P:${CROSS_DESTDIR}${LOCALBASE}:${BUILDLINK_DIR}
+.endif
 .endif
 _CWRAPPERS_TRANSFORM+= P:${X11BASE}:${BUILDLINK_X11_DIR}
 #
@@ -1075,6 +1081,12 @@ _BLNK_TRANSFORM+=        I:${LOCALBASE}:${_BLNK
 _BLNK_TRANSFORM+=      L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 _CWRAPPERS_TRANSFORM+= I:${LOCALBASE}:${BUILDLINK_DIR}
 _CWRAPPERS_TRANSFORM+= L:${LOCALBASE}:${BUILDLINK_DIR}
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+_BLNK_TRANSFORM+=      I:${CROSS_DESTDIR}${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
+_BLNK_TRANSFORM+=      L:${CROSS_DESTDIR}${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
+_CWRAPPERS_TRANSFORM+= I:${CROSS_DESTDIR}${LOCALBASE}:${BUILDLINK_DIR}
+_CWRAPPERS_TRANSFORM+= L:${CROSS_DESTDIR}${LOCALBASE}:${BUILDLINK_DIR}
+.endif
 #
 # Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.
 # (do so only after transforming references to ${LOCALBASE} if the
@@ -1090,6 +1102,9 @@ _CWRAPPERS_TRANSFORM+=    L:${X11BASE}:${BU
 # Protect any remaining references to ${LOCALBASE}, or ${X11BASE}.
 #
 _BLNK_TRANSFORM+=      untransform:sub-mangle:${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}}
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+_BLNK_TRANSFORM+=      untransform:sub-mangle:${CROSS_DESTDIR}${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}}
+.endif
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=      untransform:sub-mangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}}
 .endif