forked from hasufell/hasufell-repository
sys-apps/openrc: bump to 0.21.3
This commit is contained in:
parent
a21d660443
commit
f3487a2a7e
@ -1,39 +0,0 @@
|
|||||||
From 6d1b6a0de0a6d6af45dd816d29f9ab117257289d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Julian Ospald <hasufell@posteo.de>
|
|
||||||
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
|
|
||||||
|
|
@ -64,10 +64,6 @@ DEFAULT_SRC_INSTALL_PARAMS=(
|
|||||||
LIBMODE=0755
|
LIBMODE=0755
|
||||||
)
|
)
|
||||||
|
|
||||||
DEFAULT_SRC_PREPARE_PATCHES=(
|
|
||||||
"${FILES}"/0001-Build-fix-hardcoded-pkg-config-invocation.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
pkg_setup() {
|
pkg_setup() {
|
||||||
exdirectory --allow /etc/sysctl.d
|
exdirectory --allow /etc/sysctl.d
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user