From patchwork Wed Dec 11 07:34:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 299848 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 4B7AE2C007B for ; Wed, 11 Dec 2013 18:34:53 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id CBBDA3FEF5 for ; Wed, 11 Dec 2013 08:34:51 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 5C0AB3FED3 for ; Wed, 11 Dec 2013 08:34:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2328; q=dns/txt; s=ironport1; t=1386747289; x=1418283289; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JbRu4FlpS9GalgSE3rm4rMcVkd69p5lB1k7wr9Ip5hU=; b=pyY0i8vHSvflaIzVdDjC0xTXUW0z1YP7H++iL+eRhlHRILH0oB3fpjSI edzDvrlYz9ooPRtqL3G5fCwoUll4ox7b2prxCQS6w+TRMCjHBBPvvY3Za oc1j9A3HloX6fhVl1xXlyVjEngcyhX6GuRjOreeWV39LqBdefGSMUJ4VK Y=; X-IronPort-AV: E=Sophos;i="4.93,870,1378850400"; d="scan'208";a="4221074" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 11 Dec 2013 08:34:49 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Wed, 11 Dec 2013 08:34:48 +0100 Received: by localhost (Postfix, from userid 30007) id F09E36814D1; Wed, 11 Dec 2013 07:34:48 +0000 (UTC) From: To: Subject: [PATCH 4/5] libcap2: Patch make to support dirs a little bit more correctly Date: Wed, 11 Dec 2013 07:34:45 +0000 Message-ID: <4d35f2e6e1bfc307bf37d2e46509ebf3ee9ab656.1386747197.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/libcap/libcap2-2.22/make.patch | 36 +++++++++++++++++++++++++++++++--- recipes/libcap/libcap2.inc | 4 ++-- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/recipes/libcap/libcap2-2.22/make.patch b/recipes/libcap/libcap2-2.22/make.patch index 1cce931..a5c0d79 100644 --- a/recipes/libcap/libcap2-2.22/make.patch +++ b/recipes/libcap/libcap2-2.22/make.patch @@ -1,6 +1,36 @@ ---- libcap-2.22/Make.Rules~orig 2011-09-29 19:40:17.001271936 +0200 -+++ libcap-2.22/Make.Rules 2011-09-29 19:44:18.211271933 +0200 -@@ -47,19 +47,12 @@ +--- libcap/Make.Rules.orig 2013-12-11 07:07:10.724776533 +0000 ++++ libcap/Make.Rules 2013-12-11 07:08:18.918036287 +0000 +@@ -16,25 +16,10 @@ + lib=$(shell ldd /usr/bin/ld|fgrep ld-linux|cut -d/ -f2) + endif + +-ifdef prefix +-exec_prefix=$(prefix) +-lib_prefix=$(exec_prefix) +-inc_prefix=$(lib_prefix) +-man_prefix=$(prefix)/share +-else +-prefix=/usr +-exec_prefix= +-lib_prefix=$(exec_prefix) +-inc_prefix=$(prefix) +-man_prefix=$(prefix)/share +-endif +- +-# Target directories +- +-MANDIR=$(FAKEROOT)$(man_prefix)/man +-SBINDIR=$(FAKEROOT)$(exec_prefix)/sbin +-INCDIR=$(FAKEROOT)$(inc_prefix)/include +-LIBDIR=$(FAKEROOT)$(lib_prefix)/$(lib) ++MANDIR=$(FAKEROOT)$(mandir) ++SBINDIR=$(FAKEROOT)$(sbindir) ++INCDIR=$(FAKEROOT)$(incdir) ++LIBDIR=$(FAKEROOT)$(libdir) + + # common defines for libcap + LIBTITLE=libcap +@@ -47,19 +32,12 @@ KERNEL_HEADERS := $(topdir)/libcap/include IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) diff --git a/recipes/libcap/libcap2.inc b/recipes/libcap/libcap2.inc index fd8089d..b280d2f 100644 --- a/recipes/libcap/libcap2.inc +++ b/recipes/libcap/libcap2.inc @@ -18,8 +18,8 @@ EXTRA_OEMAKE = "PAM_CAP=no" do_install() { oe_runmake DESTDIR="${D}" \ - prefix="${prefix}" exec_prefix="${exec_prefix}" \ - lib=`basename ${libdir}` \ + sbindir="${sbindir}" libdir="${libdir}" \ + mandir="${mandir}" incdir="${includedir}" \ CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \ BUILD_CC='${BUILD_CC}' BUILD_CFLAGS='${BUILD_CFLAGS}' \ AR='${AR}' RANLIB='${RANLIB}' \