app-containers/conmon: Minimize Makefile patch

Signed-off-by: Zac Medico <[email protected]>
johu · Sep 26, 2023 · 68f423b · 68f423b
1 parent dea7603
commit 68f423b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 47 deletions.
diff --git 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
@@ -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
diff --git a/app-containers/conmon/files/conmon-2.1.8-Makefile.patch 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