commit: 68f423bfbd1a7275d23bea737cf3310621a8362d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 02:05:19 2023 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 02:15:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f423bf
app-containers/conmon: Minimize Makefile patch
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-containers/conmon/conmon-2.1.8.ebuild | 3 +-
app-containers/conmon/conmon-9999.ebuild | 3 +-
app-containers/conmon/files/001-conmon-basic.patch | 45 ----------------------
.../conmon/files/conmon-2.1.8-Makefile.patch | 15 ++++++++
4 files changed, 19 insertions(+), 47 deletions(-)
diff --git a/app-containers/conmon/conmon-2.1.8.ebuild
b/app-containers/conmon/conmon-2.1.8.ebuild
index 1f642d767a63..073e0db942c9 100644
--- a/app-containers/conmon/conmon-2.1.8.ebuild
+++ b/app-containers/conmon/conmon-2.1.8.ebuild
@@ -28,7 +28,7 @@ RDEPEND="dev-libs/glib:=
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
PATCHES=(
- "${FILESDIR}/001-conmon-basic.patch"
+ "${FILESDIR}/conmon-2.1.8-Makefile.patch"
)
src_prepare() {
@@ -48,6 +48,7 @@ src_prepare() {
src_compile() {
tc-export CC PKG_CONFIG
+ export PREFIX=${EPREFIX}/usr GOMD2MAN=go-md2man
if [[ ${PV} == *9999* ]]; then
default
else
diff --git a/app-containers/conmon/conmon-9999.ebuild
b/app-containers/conmon/conmon-9999.ebuild
index 1f642d767a63..073e0db942c9 100644
--- a/app-containers/conmon/conmon-9999.ebuild
+++ b/app-containers/conmon/conmon-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="dev-libs/glib:=
DEPEND="${RDEPEND}"
BDEPEND="dev-go/go-md2man"
PATCHES=(
- "${FILESDIR}/001-conmon-basic.patch"
+ "${FILESDIR}/conmon-2.1.8-Makefile.patch"
)
src_prepare() {
@@ -48,6 +48,7 @@ src_prepare() {
src_compile() {
tc-export CC PKG_CONFIG
+ export PREFIX=${EPREFIX}/usr GOMD2MAN=go-md2man
if [[ ${PV} == *9999* ]]; then
default
else
diff --git a/app-containers/conmon/files/001-conmon-basic.patch
b/app-containers/conmon/files/001-conmon-basic.patch
deleted file mode 100644
index 27e31cb8e0ed..000000000000
--- a/app-containers/conmon/files/001-conmon-basic.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
- VERSION := $(shell cat VERSION)
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- BINDIR ?= ${PREFIX}/bin
- LIBEXECDIR ?= ${PREFIX}/libexec
- GO ?= go
-@@ -124,7 +124,6 @@ install.podman: bin/conmon
- install ${SELINUXOPT} -m 755 bin/conmon
$(DESTDIR)$(LIBEXECDIR)/podman/conmon
-
- install.tools:
-- $(MAKE) -C tools
-
- .PHONY: fmt
- fmt:
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -1,7 +1,7 @@
--PREFIX ?= /usr/local
-+PREFIX ?= /usr
- DATADIR := ${PREFIX}/share
- MANDIR := $(DATADIR)/man
--GOMD2MAN = ../tools/build/go-md2man
-+GOMD2MAN = go-md2man
-
- docs: $(patsubst %.md,%,$(wildcard *.8.md))
-
-diff --git a/Makefile b/Makefile
-index f36dfb4..6f383b8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,10 +38,7 @@ override CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0)
-DVERSION=\"$(VERSIO
- # "pkg-config --exists" will error if the package doesn't exist. Make can
only compare
- # output of commands, so the echo commands are to allow pkg-config to error
out, make to catch it,
- # and allow the compilation to complete.
--ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0)
-- override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal)
-- override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal)
-D USE_JOURNALD=1
--else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
-+ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
- override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd)
- override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D
USE_JOURNALD=1
- endif
diff --git a/app-containers/conmon/files/conmon-2.1.8-Makefile.patch
b/app-containers/conmon/files/conmon-2.1.8-Makefile.patch
new file mode 100644
index 000000000000..193ae8a81b0e
--- /dev/null
+++ b/app-containers/conmon/files/conmon-2.1.8-Makefile.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -41,4 +41 @@
+-ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0)
+- override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal)
+- override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal)
-D USE_JOURNALD=1
+-else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
++ifeq ($(shell echo "0"), 0)
+@@ -127 +123,0 @@
+- $(MAKE) -C tools
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -4 +4 @@
+-GOMD2MAN = ../tools/build/go-md2man
++GOMD2MAN ?= ../tools/build/go-md2man
