CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 13 20:08:25 UTC 2024

Modified Files:
        pkgsrc/lang/openjdk8: builtin.mk
        pkgsrc/lang/oracle-jdk8: builtin.mk
        pkgsrc/lang/oracle-jre8: builtin.mk
        pkgsrc/lang/sun-jdk7: builtin.mk
        pkgsrc/lang/sun-jre7: builtin.mk
        pkgsrc/net/bind916: builtin.mk
        pkgsrc/net/bind918: builtin.mk
        pkgsrc/sysutils/file: builtin.mk

Log Message:
*/builtin.mk: Disable for cross-build if executes target program.

We can't run target programs during cross-build, so we either need to
disable builtin detection or find another way to detect the target
program's version.

No change to native builds because this just makes some existing
logic conditional on native builds.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk8/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/oracle-jdk8/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/oracle-jre8/builtin.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/sun-jdk7/builtin.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/sun-jre7/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind916/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind918/builtin.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/file/builtin.mk

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

Modified files:

Index: pkgsrc/lang/openjdk8/builtin.mk
diff -u pkgsrc/lang/openjdk8/builtin.mk:1.6 pkgsrc/lang/openjdk8/builtin.mk:1.7
--- pkgsrc/lang/openjdk8/builtin.mk:1.6 Mon Feb 27 11:09:40 2023
+++ pkgsrc/lang/openjdk8/builtin.mk     Sat Jan 13 20:08:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2023/02/27 11:09:40 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.7 2024/01/13 20:08:24 riastradh Exp $
 
 BUILTIN_PKG:=  openjdk8
 
@@ -26,7 +26,12 @@ MAKEVARS+=           IS_BUILTIN.openjdk8
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
 ### a package name to represent the built-in package.
 ###
-.if !defined(BUILTIN_PKG.openjdk8) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_PKG.openjdk8) && \
     ${IS_BUILTIN.openjdk8:tl} == yes
 BUILTIN_VERSION.openjdk8!=     ${OJDK8} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
 BUILTIN_PKG.openjdk8=          openjdk8-${BUILTIN_VERSION.openjdk8}

Index: pkgsrc/lang/oracle-jdk8/builtin.mk
diff -u pkgsrc/lang/oracle-jdk8/builtin.mk:1.2 pkgsrc/lang/oracle-jdk8/builtin.mk:1.3
--- pkgsrc/lang/oracle-jdk8/builtin.mk:1.2      Sun Nov  3 19:04:04 2019
+++ pkgsrc/lang/oracle-jdk8/builtin.mk  Sat Jan 13 20:08:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $
+# $NetBSD: builtin.mk,v 1.3 2024/01/13 20:08:24 riastradh Exp $
 
 BUILTIN_PKG:=  oracle-jdk8
 
@@ -44,7 +44,12 @@ MAKEVARS+=           IS_BUILTIN.oracle-jdk8
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
 ### a package name to represent the built-in package.
 ###
-.if !defined(BUILTIN_PKG.oracle-jdk8) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_PKG.oracle-jdk8) && \
     !empty(IS_BUILTIN.oracle-jdk8:M[yY][eE][sS]) && \
     empty(JDK8:M__nonexistent__)
 

Index: pkgsrc/lang/oracle-jre8/builtin.mk
diff -u pkgsrc/lang/oracle-jre8/builtin.mk:1.2 pkgsrc/lang/oracle-jre8/builtin.mk:1.3
--- pkgsrc/lang/oracle-jre8/builtin.mk:1.2      Sun Nov  3 19:04:04 2019
+++ pkgsrc/lang/oracle-jre8/builtin.mk  Sat Jan 13 20:08:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2019/11/03 19:04:04 rillig Exp $
+# $NetBSD: builtin.mk,v 1.3 2024/01/13 20:08:24 riastradh Exp $
 
 BUILTIN_PKG:=  oracle-jre8
 
@@ -44,7 +44,12 @@ MAKEVARS+=           IS_BUILTIN.oracle-jre8
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
 ### a package name to represent the built-in package.
 ###
-.if !defined(BUILTIN_PKG.oracle-jre8) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_PKG.oracle-jre8) && \
     !empty(IS_BUILTIN.oracle-jre8:M[yY][eE][sS]) && \
     empty(JAVAVM8:M__nonexistent__)
 

Index: pkgsrc/lang/sun-jdk7/builtin.mk
diff -u pkgsrc/lang/sun-jdk7/builtin.mk:1.4 pkgsrc/lang/sun-jdk7/builtin.mk:1.5
--- pkgsrc/lang/sun-jdk7/builtin.mk:1.4 Sun Nov  3 19:04:09 2019
+++ pkgsrc/lang/sun-jdk7/builtin.mk     Sat Jan 13 20:08:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:09 rillig Exp $
+# $NetBSD: builtin.mk,v 1.5 2024/01/13 20:08:24 riastradh Exp $
 
 BUILTIN_PKG:=  sun-jdk7
 
@@ -44,7 +44,12 @@ MAKEVARS+=           IS_BUILTIN.sun-jdk7
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
 ### a package name to represent the built-in package.
 ###
-.if !defined(BUILTIN_PKG.sun-jdk7) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_PKG.sun-jdk7) && \
     !empty(IS_BUILTIN.sun-jdk7:M[yY][eE][sS]) && \
     empty(JDK7:M__nonexistent__)
 

Index: pkgsrc/lang/sun-jre7/builtin.mk
diff -u pkgsrc/lang/sun-jre7/builtin.mk:1.4 pkgsrc/lang/sun-jre7/builtin.mk:1.5
--- pkgsrc/lang/sun-jre7/builtin.mk:1.4 Sun Nov  3 19:04:09 2019
+++ pkgsrc/lang/sun-jre7/builtin.mk     Sat Jan 13 20:08:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:09 rillig Exp $
+# $NetBSD: builtin.mk,v 1.5 2024/01/13 20:08:24 riastradh Exp $
 
 BUILTIN_PKG:=  sun-jre7
 
@@ -44,7 +44,12 @@ MAKEVARS+=           IS_BUILTIN.sun-jre7
 ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
 ### a package name to represent the built-in package.
 ###
-.if !defined(BUILTIN_PKG.sun-jre7) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_PKG.sun-jre7) && \
     !empty(IS_BUILTIN.sun-jre7:M[yY][eE][sS]) && \
     empty(JAVAVM7:M__nonexistent__)
 

Index: pkgsrc/net/bind916/builtin.mk
diff -u pkgsrc/net/bind916/builtin.mk:1.2 pkgsrc/net/bind916/builtin.mk:1.3
--- pkgsrc/net/bind916/builtin.mk:1.2   Thu Jan 26 13:32:47 2023
+++ pkgsrc/net/bind916/builtin.mk       Sat Jan 13 20:08:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2023/01/26 13:32:47 taca Exp $
+# $NetBSD: builtin.mk,v 1.3 2024/01/13 20:08:24 riastradh Exp $
 
 BUILTIN_PKG:=  bind
 
@@ -12,7 +12,12 @@ BUILTIN_FIND_LIBS:=          bind
 ### Figure out the version of BIND if an ISC BIND named exists on the
 ### system.
 ###
-.if !defined(BUILTIN_VERSION.bind) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_VERSION.bind) && \
     empty(EXE_NAMED:M__nonexistent__) && \
     empty(EXE_NAMED:M${LOCALBASE}/*)
 BUILTIN_VERSION.bind!= \

Index: pkgsrc/net/bind918/builtin.mk
diff -u pkgsrc/net/bind918/builtin.mk:1.1 pkgsrc/net/bind918/builtin.mk:1.2
--- pkgsrc/net/bind918/builtin.mk:1.1   Sun Dec 11 01:57:55 2022
+++ pkgsrc/net/bind918/builtin.mk       Sat Jan 13 20:08:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+# $NetBSD: builtin.mk,v 1.2 2024/01/13 20:08:25 riastradh Exp $
 
 BUILTIN_PKG:=  bind
 
@@ -12,7 +12,12 @@ BUILTIN_FIND_LIBS:=          bind
 ### Figure out the version of BIND if an ISC BIND named exists on the
 ### system.
 ###
-.if !defined(BUILTIN_VERSION.bind) && \
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+###
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_VERSION.bind) && \
     empty(EXE_NAMED:M__nonexistent__) && \
     empty(EXE_NAMED:M${LOCALBASE}/*)
 BUILTIN_VERSION.bind!= \

Index: pkgsrc/sysutils/file/builtin.mk
diff -u pkgsrc/sysutils/file/builtin.mk:1.8 pkgsrc/sysutils/file/builtin.mk:1.9
--- pkgsrc/sysutils/file/builtin.mk:1.8 Mon Nov  4 21:28:45 2019
+++ pkgsrc/sysutils/file/builtin.mk     Sat Jan 13 20:08:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2019/11/04 21:28:45 rillig Exp $
+# $NetBSD: builtin.mk,v 1.9 2024/01/13 20:08:25 riastradh Exp $
 
 BUILTIN_PKG:=  file
 
@@ -27,7 +27,12 @@ BUILTIN_CMD.file=    file
 .endif
 MAKEVARS+=             IS_BUILTIN.file
 
-.if !defined(BUILTIN_PKG.file) && !empty(IS_BUILTIN.file:M[yY][eE][sS])
+### XXX This doesn't work for cross-compilation because we can't
+### execute the target system's program.  Can the version be discovered
+### any other way?
+.if ${USE_CROSS_COMPILE:tl} != "yes" && \
+    !defined(BUILTIN_PKG.file) && \
+    !empty(IS_BUILTIN.file:M[yY][eE][sS])
 BUILTIN_VERSION.file!= ${BUILTIN_CMD.file} --version 2>&1 | ${GREP} 'file-' | ${SED} 's/file-//'
 BUILTIN_PKG.file=      file-${BUILTIN_VERSION.file}
 .endif