From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C8CB1581D3 for ; Sun, 26 May 2024 23:31:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C748E29E1; Sun, 26 May 2024 23:31:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AC5CE29E1 for ; Sun, 26 May 2024 23:31:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98B9333BDF5 for ; Sun, 26 May 2024 23:31:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0581F149C for ; Sun, 26 May 2024 23:31:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1716766271.1728e374db8721b71bad2ad4ac1e76e949849a5f.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/podman/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/podman/podman-4.9.4.ebuild app-containers/podman/podman-5.0.2.ebuild app-containers/podman/podman-5.0.3.ebuild app-containers/podman/podman-9999.ebuild X-VCS-Directories: app-containers/podman/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1728e374db8721b71bad2ad4ac1e76e949849a5f X-VCS-Branch: master Date: Sun, 26 May 2024 23:31:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e84513d7-07c4-4afe-a326-2331a14af8b7 X-Archives-Hash: b9914354cb85bc0ccd97ed58f074b5ac commit: 1728e374db8721b71bad2ad4ac1e76e949849a5f Author: Krzesimir Nowak microsoft com> AuthorDate: Fri May 24 11:50:50 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 26 23:31:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1728e374 app-containers/podman: Fix cross-compilation issues with gpgme Need to tell cgo to use proper pkg-config with the PKG_CONFIG environment variable. Bug: https://bugs.gentoo.org/930982 Signed-off-by: Krzesimir Nowak microsoft.com> Closes: https://github.com/gentoo/gentoo/pull/36805 Closes: https://bugs.gentoo.org/930982 Signed-off-by: Zac Medico gentoo.org> app-containers/podman/podman-4.9.4.ebuild | 8 +++++++- app-containers/podman/podman-5.0.2.ebuild | 8 +++++++- app-containers/podman/podman-5.0.3.ebuild | 8 +++++++- app-containers/podman/podman-9999.ebuild | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app-containers/podman/podman-4.9.4.ebuild b/app-containers/podman/podman-4.9.4.ebuild index 845dcbc2a7aa..ea2bd34e2507 100644 --- a/app-containers/podman/podman-4.9.4.ebuild +++ b/app-containers/podman/podman-4.9.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11,12} ) -inherit go-module python-any-r1 tmpfiles linux-info +inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI" HOMEPAGE="https://github.com/containers/podman/ https://podman.io/" @@ -103,6 +103,12 @@ src_compile() { # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT="" + # Use proper pkg-config to get gpgme cflags and ldflags when + # cross-compiling, bug 930982. + if tc-is-cross-compiler; then + tc-export PKG_CONFIG + fi + # BUILD_SECCOMP is used in the patch to toggle seccomp emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs) } diff --git a/app-containers/podman/podman-5.0.2.ebuild b/app-containers/podman/podman-5.0.2.ebuild index b535f608f817..738613b007dc 100644 --- a/app-containers/podman/podman-5.0.2.ebuild +++ b/app-containers/podman/podman-5.0.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11,12} ) -inherit go-module python-any-r1 tmpfiles linux-info +inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI" HOMEPAGE="https://github.com/containers/podman/ https://podman.io/" @@ -95,6 +95,12 @@ src_compile() { # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT="" + # Use proper pkg-config to get gpgme cflags and ldflags when + # cross-compiling, bug 930982. + if tc-is-cross-compiler; then + tc-export PKG_CONFIG + fi + # BUILD_SECCOMP is used in the patch to toggle seccomp emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \ all $(usev wrapper docker-docs) diff --git a/app-containers/podman/podman-5.0.3.ebuild b/app-containers/podman/podman-5.0.3.ebuild index b535f608f817..738613b007dc 100644 --- a/app-containers/podman/podman-5.0.3.ebuild +++ b/app-containers/podman/podman-5.0.3.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11,12} ) -inherit go-module python-any-r1 tmpfiles linux-info +inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI" HOMEPAGE="https://github.com/containers/podman/ https://podman.io/" @@ -95,6 +95,12 @@ src_compile() { # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT="" + # Use proper pkg-config to get gpgme cflags and ldflags when + # cross-compiling, bug 930982. + if tc-is-cross-compiler; then + tc-export PKG_CONFIG + fi + # BUILD_SECCOMP is used in the patch to toggle seccomp emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \ all $(usev wrapper docker-docs) diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild index b535f608f817..738613b007dc 100644 --- a/app-containers/podman/podman-9999.ebuild +++ b/app-containers/podman/podman-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11,12} ) -inherit go-module python-any-r1 tmpfiles linux-info +inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI" HOMEPAGE="https://github.com/containers/podman/ https://podman.io/" @@ -95,6 +95,12 @@ src_compile() { # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT="" + # Use proper pkg-config to get gpgme cflags and ldflags when + # cross-compiling, bug 930982. + if tc-is-cross-compiler; then + tc-export PKG_CONFIG + fi + # BUILD_SECCOMP is used in the patch to toggle seccomp emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \ all $(usev wrapper docker-docs)