From patchwork Mon Nov 30 06:48:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1408045 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=uKtUiFHA; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Ckwr36n5Lz9s0b for ; Mon, 30 Nov 2020 17:51:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 479B6872F5; Mon, 30 Nov 2020 06:51:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CVdKofW3X0Hh; Mon, 30 Nov 2020 06:51:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 260AD872A7; Mon, 30 Nov 2020 06:51:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5A3E81BF59F for ; Mon, 30 Nov 2020 06:51:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5390F868CE for ; Mon, 30 Nov 2020 06:51:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8czYdbYKSiAi for ; Mon, 30 Nov 2020 06:51:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 727E3868BF for ; Mon, 30 Nov 2020 06:51:21 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id d3so13735806wmb.4 for ; Sun, 29 Nov 2020 22:51:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FapC/KE4A+l6xfrfJhUmaquARYWMZ0QcDMNjeZmbMns=; b=uKtUiFHAXftcsKHyfE1LhY/5kqZAI/It1wYbWaCJjZLmauWb1vQg5WXL7o+Xbjyv+9 XvJ3DhvcFrjMqqRzXVxXV/e2d4onCocvVmSef4cpLZvQCdsdU4fHynd40SJHL1NFss6P xO+ap9j/5hVsDD2hPTmmcROVg1Ec2oExi8HQ1f3Eb6S9AELwOPFwgvYSlc+d+x1IvlRl 3Ln/4ZtpFYsFXVv8KfruUEJuJmpMTiE916j9PMjjleXlaifwQuP1xcKCYKoUBcofjhmK WNKPLQNk89OcpKeH4cQw61WFiv6nljsOMHGf2D0zez7lk0N7+nEVSB1mGKkWJLmKiil0 WB3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FapC/KE4A+l6xfrfJhUmaquARYWMZ0QcDMNjeZmbMns=; b=jyh/bZ6j4c2qcbl/CRlNTYg7MPtrixL0K3qX/nb9rH0HQmY7rQEp3qsm6/ue96rk9B fdOv2tZWxHw6CMEKmZVfgKn0z2ExC0kc2CC/ktilErDF2DKzLqZJWQ/mWV+XxUQ5NvjB 99gwESAmGxx0pJAG4RPlDewXZ76sbGsRUjhPqh9lYj2ELHIWVySs5T78WcBiEuPFPOd7 5D4iT8RagElGPwRkupTia7+Pnbt6rqVi0P5/lQlwrSWeWJA2zXZnqtzlZFXYZzgaoyOQ +1mHtzlNa/fgymxlwcN0CfhAYPnM74V1BTP4sPwwVdA3Y7nkX7XNK0qwTD3uU7r3WNbc GfKA== X-Gm-Message-State: AOAM5314QCkUAkyT4oJF5ualYxSmjE2rDO1CFCJA+6kESeJYBbZocdFB wmso+KXbI6zojWE1UsG0TcJqan+NezOj1Q== X-Google-Smtp-Source: ABdhPJwDSD42hE81aBpZbFG4FTThVL7oRNs2h1xHQAiCWZIUkEL9NiTdYIr5QpbSFJQzdHw/lWgNWQ== X-Received: by 2002:a1c:a9c4:: with SMTP id s187mr5581991wme.116.1606719079583; Sun, 29 Nov 2020 22:51:19 -0800 (PST) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id j13sm20185644wrp.70.2020.11.29.22.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 22:51:18 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 30 Nov 2020 07:48:33 +0100 Message-Id: <20201130064833.12007-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2,1/1] package/libcap: new fix to libcap.pc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" As spotted by Peter Seiderer, prefix must be passed to {HOST_LIBCAP,LIBCAP}_BUILD_CMDS so libdir in libcap.pc is set to /usr/lib instead of /lib Signed-off-by: Fabrice Fontaine Reviewed-by: Peter Seiderer --- Changes v1 -> v2: - Also fi host libcap package/libcap/libcap.mk | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index a4a9170193..7bb8f57671 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -20,6 +20,7 @@ LIBCAP_MAKE_FLAGS = \ BUILD_CC="$(HOSTCC)" \ BUILD_CFLAGS="$(HOST_CFLAGS)" \ lib=lib \ + prefix=/usr \ SHARED=$(if $(BR2_STATIC_LIBS),,yes) \ PTHREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,) @@ -39,27 +40,31 @@ endef define LIBCAP_INSTALL_STAGING_CMDS $(foreach d,$(LIBCAP_MAKE_DIRS), \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(STAGING_DIR) prefix=/usr install + DESTDIR=$(STAGING_DIR) install ) endef define LIBCAP_INSTALL_TARGET_CMDS $(foreach d,$(LIBCAP_MAKE_DIRS), \ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$(d) $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(TARGET_DIR) prefix=/usr install + DESTDIR=$(TARGET_DIR) install ) endef +HOST_LIBCAP_MAKE_FLAGS = \ + DYNAMIC=yes \ + GOLANG=no \ + lib=lib \ + prefix=$(HOST_DIR) \ + RAISE_SETFCAP=no + define HOST_LIBCAP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ - DYNAMIC=yes \ - RAISE_SETFCAP=no GOLANG=no lib=lib + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + $(HOST_LIBCAP_MAKE_FLAGS) endef define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) \ - DYNAMIC=yes \ - RAISE_SETFCAP=no GOLANG=no lib=lib install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBCAP_MAKE_FLAGS) install endef $(eval $(generic-package))