diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-12-05 11:04:31 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-05 11:04:31 +0000 |
commit | 5944ce177026c93b7dab690db9d970567ddbf75f (patch) | |
tree | 98cde802bce7341b8039a2189a44a6e85f5a426b /app-containers/buildah/files | |
parent | d0835364e1877539c2b8ce70c1941ebfedd2a91b (diff) |
gentoo auto-resync : 05:12:2023 - 11:04:31
Diffstat (limited to 'app-containers/buildah/files')
-rw-r--r-- | app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch b/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch new file mode 100644 index 000000000000..51ba7df1aa90 --- /dev/null +++ b/app-containers/buildah/files/fix-non-amd64-build-1.33.2.patch @@ -0,0 +1,44 @@ +From 12b205f69876bf09bb6dfe03adcdefad5d4ee9f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com> +Date: Mon, 20 Nov 2023 09:28:06 +0100 +Subject: [PATCH] Remove makefile targets entrypoint{,.gz} for non x86_64 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://github.com/containers/buildah/pull/5183 +The target internal/mkcw/embed/entrypoint is only built on x86_64, but +internal/mkcw/embed/entrypoint.gz is run on all arches. This causes build +failures on anything non x86_64 as internal/mkcw/embed/entrypoint is not build. + +Signed-off-by: Dan Čermák <dcermak@suse.com> +--- + Makefile | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 85b43c7b9e..0fda9ae6eb 100644 +--- a/Makefile ++++ b/Makefile +@@ -73,17 +73,16 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz + $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah + + ifneq ($(shell as --version | grep x86_64),) ++internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint ++ $(RM) $@ ++ gzip -k $^ ++ + internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s + $(AS) -o $(patsubst %.s,%.o,$^) $^ + $(LD) -o $@ $(patsubst %.s,%.o,$^) + strip $@ +-else +-.PHONY: internal/mkcw/embed/entrypoint + endif + +-internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint +- $(RM) $@ +- gzip -k $^ + + .PHONY: buildah + buildah: bin/buildah |