pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/mk/tools



Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:55:49 UTC 2024

Modified Files:
        pkgsrc/mk/tools: replace.mk

Log Message:
mk/tools: Prohibit USE_TOOLS+=foo:run in cross-built packages.

This just doesn't work yet, sorry!  Makes the problem easier to
identify up front.  Eventually, these cases need to be converted to
use TOOL_DEPENDS, but we also need to be able to split native and
cross `tools' here.

No change to native builds because the new failure is conditional on
USE_CROSS_COMPILE = yes (and OPSYS != NATIVE_OPSYS).

XXX Should also check for OS_VERSION != NATIVE_OS_VERSION, &c.


To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 pkgsrc/mk/tools/replace.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/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.302 pkgsrc/mk/tools/replace.mk:1.303
--- pkgsrc/mk/tools/replace.mk:1.302    Tue Mar 26 16:27:13 2024
+++ pkgsrc/mk/tools/replace.mk  Fri Apr 12 19:55:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.302 2024/03/26 16:27:13 schmonz Exp $
+# $NetBSD: replace.mk,v 1.303 2024/04/12 19:55:49 riastradh Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -140,6 +140,9 @@ _TOOLS_DEPMETHOD.${_t_:C/:.*//}=    BOOTSTR
 _TOOLS_DEPMETHOD.${_t_:C/:.*//}=       TOOL_DEPENDS
 .endfor
 .for _t_ in ${USE_TOOLS:M*\:run}
+.  if ${USE_CROSS_COMPILE:tl} == "yes" && ${OPSYS} != ${NATIVE_OPSYS}
+PKG_FAIL_REASON+=      "USE_TOOLS+=${_t_} not supported in cross-compilation"
+.  endif
 _TOOLS_DEPMETHOD.${_t_:C/:.*//}=       DEPENDS
 .endfor
 .for _t_ in ${USE_TOOLS:M*\:test}



Home | Main Index | Thread Index | Old Index