From bed3d89f958820e3fc462a156c6bb6097cee9ffa Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 29 Jun 2016 14:33:06 +0200 Subject: [PATCH] sys-apps/openrc: fix pkg-config invocation --- ...-fix-hardcoded-pkg-config-invocation.patch | 39 +++++++++++++++++++ .../sys-apps/openrc/openrc-0.20.5.exheres-0 | 6 +++ 2 files changed, 45 insertions(+) create mode 100644 packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch diff --git a/packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch b/packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch new file mode 100644 index 00000000..1b7f8d4f --- /dev/null +++ b/packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch @@ -0,0 +1,39 @@ +From 6d1b6a0de0a6d6af45dd816d29f9ab117257289d Mon Sep 17 00:00:00 2001 +From: Julian Ospald +Date: Wed, 29 Jun 2016 14:27:37 +0200 +Subject: [PATCH] Build: fix hardcoded pkg-config invocation +Upstream: pending, https://github.com/OpenRC/openrc/pull/89 + +--- + mk/sys.mk | 1 + + mk/termcap.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/mk/sys.mk b/mk/sys.mk +index 948ec1d..47d9526 100644 +--- a/mk/sys.mk ++++ b/mk/sys.mk +@@ -11,6 +11,7 @@ + + AR?= ar + CP?= cp ++PKG_CONFIG?= pkg-config + ECHO?= echo + INSTALL?= install + RANLIB?= ranlib +diff --git a/mk/termcap.mk b/mk/termcap.mk +index 2d6ad01..4890e35 100644 +--- a/mk/termcap.mk ++++ b/mk/termcap.mk +@@ -1,6 +1,6 @@ + ifeq (${MKTERMCAP},ncurses) +-TERMCAP_CFLAGS:= $(shell pkg-config ncurses --cflags 2> /dev/null) +-LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) ++TERMCAP_CFLAGS:= $(shell ${PKG_CONFIG} ncurses --cflags 2> /dev/null) ++LTERMCAP:= $(shell ${PKG_CONFIG} ncurses --libs 2> /dev/null) + ifeq ($(LTERMCAP),) + LIBTERMCAP?= -lncurses + else +-- +2.9.0 + diff --git a/packages/sys-apps/openrc/openrc-0.20.5.exheres-0 b/packages/sys-apps/openrc/openrc-0.20.5.exheres-0 index 88717191..a8155760 100644 --- a/packages/sys-apps/openrc/openrc-0.20.5.exheres-0 +++ b/packages/sys-apps/openrc/openrc-0.20.5.exheres-0 @@ -64,11 +64,17 @@ DEFAULT_SRC_INSTALL_PARAMS=( LIBMODE=0755 ) +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/0001-Build-fix-hardcoded-pkg-config-invocation.patch +) + pkg_setup() { exdirectory --allow /etc/sysctl.d } src_prepare() { + default + edo sed -e 's#readelf #${READELF:-readelf} #g' \ -i src/test/runtests.sh