Sat Sep 17 16:13:10 2022 UTC ()
devel/kBuild: use `uname -p` on NetBSD to find CPU family.

Fixes build problem on NetBSD/macppc.


(he)
diff -r1.4 -r1.5 pkgsrc/devel/kbuild/distinfo
diff -r0 -r1.1 pkgsrc/devel/kbuild/patches/patch-kBuild_env.sh
cvs diff -r1.4 -r1.5 pkgsrc/devel/kbuild/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/kbuild/distinfo 2021/10/26 10:15:08 1.4
+++ pkgsrc/devel/kbuild/distinfo 2022/09/17 16:13:10 1.5
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 10:15:08 nia Exp $ 1$NetBSD: distinfo,v 1.5 2022/09/17 16:13:10 he Exp $
2 2
3BLAKE2s (kBuild-r3127.tar.gz) = ba9cdf0c2e04f3a258f38e1c6ff257eb54275f31cd824c74a9d5d252eb0b145b 3BLAKE2s (kBuild-r3127.tar.gz) = ba9cdf0c2e04f3a258f38e1c6ff257eb54275f31cd824c74a9d5d252eb0b145b
4SHA512 (kBuild-r3127.tar.gz) = 6a724892d32c25a08dede7969d3878dea2c18f47da30908b147451e36297f77fdb806c34c457524010d3eadf199858843a92ca4cef774a0b8a700471708cb36c 4SHA512 (kBuild-r3127.tar.gz) = 6a724892d32c25a08dede7969d3878dea2c18f47da30908b147451e36297f77fdb806c34c457524010d3eadf199858843a92ca4cef774a0b8a700471708cb36c
5Size (kBuild-r3127.tar.gz) = 17579258 bytes 5Size (kBuild-r3127.tar.gz) = 17579258 bytes
 6SHA1 (patch-kBuild_env.sh) = 3e4d46951a6b14dfaff94f0338dd10e24d2230f8
6SHA1 (patch-kBuild_header.kmk) = bcba91ea5f4ae200087aa0adf4632b461661ed26 7SHA1 (patch-kBuild_header.kmk) = bcba91ea5f4ae200087aa0adf4632b461661ed26
7SHA1 (patch-src_kmk_Makefile.kmk) = 7647322e79030bf794caa900feaf5dbe293a2247 8SHA1 (patch-src_kmk_Makefile.kmk) = 7647322e79030bf794caa900feaf5dbe293a2247
8SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = de8a40b3a454abaf82b3384f0c44dd98794d0267 9SHA1 (patch-src_kmk_kmkbuiltin_osdep.c) = de8a40b3a454abaf82b3384f0c44dd98794d0267
9SHA1 (patch-src_sed_lib_utils.c) = a2414f2d80623b94ab34fbc1744a2e3bc33571b3 10SHA1 (patch-src_sed_lib_utils.c) = a2414f2d80623b94ab34fbc1744a2e3bc33571b3
File Added: pkgsrc/devel/kbuild/patches/patch-kBuild_env.sh
$NetBSD: patch-kBuild_env.sh,v 1.1 2022/09/17 16:13:10 he Exp $

On NetBSD, use `uname -p` to find the processor family.
`uname -m` might give e.g. "macppc", which is the "machine hardware".

--- kBuild/env.sh.orig	2017-11-22 20:15:12.000000000 +0000
+++ kBuild/env.sh
@@ -332,7 +332,11 @@ if test -z "$KBUILD_HOST_ARCH"; then
         KBUILD_HOST_ARCH=`isainfo | cut -f 1 -d ' '`
 
     else
-        KBUILD_HOST_ARCH=`uname -m`
+	if test $KBUILD_HOST = netbsd; then
+	    KBUILD_HOST_ARCH=`uname -p`
+	else
+            KBUILD_HOST_ARCH=`uname -m`
+	fi
     fi
     case "$KBUILD_HOST_ARCH" in
         x86_64|AMD64|amd64|k8|k8l|k9|k10)