From 1779f5564cd04dc6dd35fa0d75619082a80a1d67 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Thu, 23 Mar 2023 11:10:47 -0500 Subject: [PATCH] patches/ebuilds: Fixes to cross-compile conmon Gentoo bugs [901481][0] and [902085][1]. [0]: https://bugs.gentoo.org/show_bug.cgi?id=901481 [1]: https://bugs.gentoo.org/show_bug.cgi?id=902085 --- .../app-containers/conmon/bdepend-go-md2man.patch | 13 +++++++++++++ .../app-containers/conmon/cross-pkg-config.patch | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 patches/ebuilds/app-containers/conmon/bdepend-go-md2man.patch create mode 100644 patches/ebuilds/app-containers/conmon/cross-pkg-config.patch diff --git a/patches/ebuilds/app-containers/conmon/bdepend-go-md2man.patch b/patches/ebuilds/app-containers/conmon/bdepend-go-md2man.patch new file mode 100644 index 0000000..f216e73 --- /dev/null +++ b/patches/ebuilds/app-containers/conmon/bdepend-go-md2man.patch @@ -0,0 +1,13 @@ +--- a/conmon-2.1.6.ebuild 2023-02-22 01:40:17.000000000 -0000 ++++ b/conmon-2.1.6.ebuild 2023-03-17 15:27:37.119865995 -0000 +@@ -18,8 +18,8 @@ + RDEPEND="dev-libs/glib:= + sys-libs/libseccomp + systemd? ( sys-apps/systemd:= )" +-DEPEND="${RDEPEND} +- dev-go/go-md2man" ++DEPEND="${RDEPEND}" ++BDEPEND="dev-go/go-md2man" + + src_prepare() { + default diff --git a/patches/ebuilds/app-containers/conmon/cross-pkg-config.patch b/patches/ebuilds/app-containers/conmon/cross-pkg-config.patch new file mode 100644 index 0000000..be92ba8 --- /dev/null +++ b/patches/ebuilds/app-containers/conmon/cross-pkg-config.patch @@ -0,0 +1,11 @@ +--- a/conmon-2.1.6.ebuild 2023-03-16 15:02:17.213375763 -0000 ++++ b/conmon-2.1.6.ebuild 2023-03-16 15:02:46.337375763 -0000 +@@ -34,7 +34,7 @@ + } + + src_compile() { +- tc-export CC ++ tc-export CC PKG_CONFIG + emake GIT_COMMIT="v${PV}" \ + all + }