Mon Feb 20 09:58:02 2023 UTC ()
podman: try to fix build on netbsd-9

"env -u" flag was added in NetBSD 10.


(tnn)
diff -r1.7 -r1.8 pkgsrc/sysutils/podman/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/podman/patches/patch-Makefile
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/podman/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/podman/distinfo 2023/02/14 00:33:12 1.7
+++ pkgsrc/sysutils/podman/distinfo 2023/02/20 09:58:02 1.8
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.7 2023/02/14 00:33:12 tnn Exp $ 1$NetBSD: distinfo,v 1.8 2023/02/20 09:58:02 tnn Exp $
2 2
3BLAKE2s (podman-4.4.1.tar.gz) = 6ea927ab6855095064f5d915e407d424ca54a738d4d2a378b522d4eedef7ae37 3BLAKE2s (podman-4.4.1.tar.gz) = 6ea927ab6855095064f5d915e407d424ca54a738d4d2a378b522d4eedef7ae37
4SHA512 (podman-4.4.1.tar.gz) = 33a22b7941f4f6715baa1cd2d5b29a4e2e95264c5239877122448f71e1408d8c393bcd2cdaef9516a580eede911c84f1cfea9d7b4c9d287a2737986fdc604e2c 4SHA512 (podman-4.4.1.tar.gz) = 33a22b7941f4f6715baa1cd2d5b29a4e2e95264c5239877122448f71e1408d8c393bcd2cdaef9516a580eede911c84f1cfea9d7b4c9d287a2737986fdc604e2c
5Size (podman-4.4.1.tar.gz) = 14396828 bytes 5Size (podman-4.4.1.tar.gz) = 14396828 bytes
6SHA1 (patch-Makefile) = a5c09292ef911863db1c7f36d5cba1231f23ee92 6SHA1 (patch-Makefile) = a0323aacb2176f2df4c0e21ad3dfff1479c91db3
7SHA1 (patch-cmd_podman_machine_init.go) = 840273e31e44b670ef5a5ce0f26fedbeb8ebdb34 7SHA1 (patch-cmd_podman_machine_init.go) = 840273e31e44b670ef5a5ce0f26fedbeb8ebdb34
8SHA1 (patch-cmd_podman_registry_config.go) = 80b0f940c59f0c0f258c2240bac30af6a0cb21dd 8SHA1 (patch-cmd_podman_registry_config.go) = 80b0f940c59f0c0f258c2240bac30af6a0cb21dd
9SHA1 (patch-pkg_machine_ignition__netbsd.go) = f5b4640d77c6152aa51c0c0e68de47fded340869 9SHA1 (patch-pkg_machine_ignition__netbsd.go) = f5b4640d77c6152aa51c0c0e68de47fded340869
10SHA1 (patch-pkg_machine_qemu_machine.go) = 8b0957edb19a70333b19db27a54b02cedf968696 10SHA1 (patch-pkg_machine_qemu_machine.go) = 8b0957edb19a70333b19db27a54b02cedf968696
11SHA1 (patch-pkg_machine_qemu_options__netbsd.go) = a256dcafceb70f29b4f7a1ed013b52b5d6b0f4ba 11SHA1 (patch-pkg_machine_qemu_options__netbsd.go) = a256dcafceb70f29b4f7a1ed013b52b5d6b0f4ba
12SHA1 (patch-pkg_machine_qemu_options__netbsd__amd64.go) = 7f5e4fe206e6e1d8f8e2cd33c8ac18b614c2dd61 12SHA1 (patch-pkg_machine_qemu_options__netbsd__amd64.go) = 7f5e4fe206e6e1d8f8e2cd33c8ac18b614c2dd61
13SHA1 (patch-pkg_util_utils__netbsd.go) = dcda52540148e5c77034322198a8ecedcd8c07e7 13SHA1 (patch-pkg_util_utils__netbsd.go) = dcda52540148e5c77034322198a8ecedcd8c07e7
14SHA1 (patch-utils_utils__supported.go) = 44938037e4e0a4cd9468b2d37e480b78d404099b 14SHA1 (patch-utils_utils__supported.go) = 44938037e4e0a4cd9468b2d37e480b78d404099b
15SHA1 (patch-vendor_github.com_containers_buildah_define_mount__unsupported.go) = 75d1a3dfce7806476f04d4a6d67a7858583838ee 15SHA1 (patch-vendor_github.com_containers_buildah_define_mount__unsupported.go) = 75d1a3dfce7806476f04d4a6d67a7858583838ee
16SHA1 (patch-vendor_github.com_containers_buildah_util_util__uint64.go) = a140e19d7c14439cc61d57acfb41bc601f2cf5a8 16SHA1 (patch-vendor_github.com_containers_buildah_util_util__uint64.go) = a140e19d7c14439cc61d57acfb41bc601f2cf5a8
17SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = baf41542f16a9b73cd52a6162fb021a1259d73c6 17SHA1 (patch-vendor_github.com_containers_buildah_util_util__unix.go) = baf41542f16a9b73cd52a6162fb021a1259d73c6
18SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__darwin.go) = f675c6e8a2ba2ca03f0c6642296545ffdb08bc75 18SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__darwin.go) = f675c6e8a2ba2ca03f0c6642296545ffdb08bc75
19SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go) = 2b0dbfec397ce7765ccbb4d1d4e3b05ff487ed18 19SHA1 (patch-vendor_github.com_containers_common_pkg_config_config__netbsd.go) = 2b0dbfec397ce7765ccbb4d1d4e3b05ff487ed18
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/podman/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/podman/patches/patch-Makefile 2023/02/14 00:33:13 1.2
+++ pkgsrc/sysutils/podman/patches/patch-Makefile 2023/02/20 09:58:02 1.3
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1$NetBSD: patch-Makefile,v 1.2 2023/02/14 00:33:13 tnn Exp $ 1$NetBSD: patch-Makefile,v 1.3 2023/02/20 09:58:02 tnn Exp $
2 2
3Add netbsd support 3Add netbsd support
4 4
5--- Makefile.orig 2023-02-08 19:03:18.000000000 +0000 5--- Makefile.orig 2023-02-08 19:03:18.000000000 +0000
6+++ Makefile 6+++ Makefile
 7@@ -162,10 +162,10 @@ err_if_empty = $(if $(strip $($(1))),$(s
 8 # Windows and Mac (both podman-remote client only) require CGO_ENABLED=0.
 9 CGO_ENABLED ?= 1
 10 # Default to the native OS type and architecture unless otherwise specified
 11-NATIVE_GOOS := $(shell env -u GOOS $(GO) env GOOS)
 12+NATIVE_GOOS := $(shell env GOOS= $(GO) env GOOS)
 13 GOOS ?= $(call err_if_empty,NATIVE_GOOS)
 14 # Default to the native architecture type
 15-NATIVE_GOARCH := $(shell env -u GOARCH $(GO) env GOARCH)
 16+NATIVE_GOARCH := $(shell env GOARCH= $(GO) env GOARCH)
 17 GOARCH ?= $(NATIVE_GOARCH)
 18 ifeq ($(call err_if_empty,GOOS),windows)
 19 BINSFX := .exe
7@@ -175,6 +175,10 @@ else ifeq ($(GOOS),darwin) 20@@ -175,6 +175,10 @@ else ifeq ($(GOOS),darwin)
8 BINSFX := 21 BINSFX :=
9 SRCBINDIR := bin/darwin 22 SRCBINDIR := bin/darwin
10 CGO_ENABLED := 0 23 CGO_ENABLED := 0
11+else ifeq ($(GOOS),netbsd) 24+else ifeq ($(GOOS),netbsd)
12+BINSFX := 25+BINSFX :=
13+SRCBINDIR := bin/netbsd 26+SRCBINDIR := bin/netbsd
14+CGO_ENABLED := 0 27+CGO_ENABLED := 0
15 else 28 else
16 BINSFX := -remote 29 BINSFX := -remote
17 SRCBINDIR := bin 30 SRCBINDIR := bin