kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
All gated on ${USE_CROSS_COMPILE:tl} == "yes", so no change to native
compilation.
This commit is contained in:
riastradh 2023-06-27 10:40:09 +00:00
parent 3e4be700da
commit c9d46c64dc
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mk/buildlink3/bsd.buildlink3.mk
View file

@ -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. # Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved. # All rights reserved.
@ -1052,9 +1052,15 @@ _CWRAPPERS_TRANSFORM+= R:${_dir_}:${_dir_}
# ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}. # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
# #
_BLNK_TRANSFORM+= P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${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" .if defined(USE_X11) && ${X11_TYPE} != "modular"
_BLNK_TRANSFORM+= P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}} _BLNK_TRANSFORM+= P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
_CWRAPPERS_TRANSFORM+= P:${LOCALBASE}:${BUILDLINK_DIR} _CWRAPPERS_TRANSFORM+= P:${LOCALBASE}:${BUILDLINK_DIR}
.if ${USE_CROSS_COMPILE:tl} == "yes"
_CWRAPPERS_TRANSFORM+= P:${CROSS_DESTDIR}${LOCALBASE}:${BUILDLINK_DIR}
.endif
.endif .endif
_CWRAPPERS_TRANSFORM+= P:${X11BASE}:${BUILDLINK_X11_DIR} _CWRAPPERS_TRANSFORM+= P:${X11BASE}:${BUILDLINK_X11_DIR}
# #
@ -1075,6 +1081,12 @@ _BLNK_TRANSFORM+= I:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
_BLNK_TRANSFORM+= L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}} _BLNK_TRANSFORM+= L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
_CWRAPPERS_TRANSFORM+= I:${LOCALBASE}:${BUILDLINK_DIR} _CWRAPPERS_TRANSFORM+= I:${LOCALBASE}:${BUILDLINK_DIR}
_CWRAPPERS_TRANSFORM+= L:${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}. # Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.
# (do so only after transforming references to ${LOCALBASE} if the # (do so only after transforming references to ${LOCALBASE} if the
@ -1090,6 +1102,9 @@ _CWRAPPERS_TRANSFORM+= L:${X11BASE}:${BUILDLINK_X11_DIR}
# Protect any remaining references to ${LOCALBASE}, or ${X11BASE}. # Protect any remaining references to ${LOCALBASE}, or ${X11BASE}.
# #
_BLNK_TRANSFORM+= untransform:sub-mangle:${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}} _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" .if defined(USE_X11) && ${X11_TYPE} != "modular"
_BLNK_TRANSFORM+= untransform:sub-mangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}} _BLNK_TRANSFORM+= untransform:sub-mangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}}
.endif .endif