From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7297BC43381 for ; Thu, 21 Mar 2019 22:27:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E03B21917 for ; Thu, 21 Mar 2019 22:27:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MncG6+Xn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727173AbfCUW1P (ORCPT ); Thu, 21 Mar 2019 18:27:15 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34321 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726370AbfCUW1P (ORCPT ); Thu, 21 Mar 2019 18:27:15 -0400 Received: by mail-wr1-f66.google.com with SMTP id p10so306573wrq.1 for ; Thu, 21 Mar 2019 15:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ulxgTOzuBa6qDYdekgs1lOMM9op5zAGOUT3znDOmZGo=; b=MncG6+XnEz4UlUai5wMBoH9xXEextgMYuWFKmYpUF+PNDUzPVC84/j3YtUBD7jIVom SWsLD+oPEo6QG87qGA6sqzJ9eo6sW9Ocjcbm4ue/JWewQ670CXSugRirfoF+Sp8vK6rH SAa/iRPJMRIHBjjwniS6mqoTCRydMNlyRf5KshdRwy2p9LBmYSJytQjJ18T+VPFvsmcb YeJr4D2GYXq52+8vvoKWZiYYAH+a1Qupmn7rYT04/RBwpcr6qNx8S8kwBsavC1Rrj0af /0YlqrRdZGXvxFs9sU6mSqKIFhzIZ/2iRO6T7+FbIGQVTbTJjO+yXtES5PymNDST77zw jYLg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ulxgTOzuBa6qDYdekgs1lOMM9op5zAGOUT3znDOmZGo=; b=lYH2Sb2hSk271benxJpjkppI72KcOO8cjoQFZu3VspuwC08Zmm9/1aqkcmxQ06NgLn XvS/JshRfGJy8CVPawWG5HVuQlMb5D7tVmPvvvJUOuw115MRDK0aPFxnkV8QN7vxqD8P k3hdESS3iFq3Kt3DZf8E1A6Zpwi6ZBfqtc8bHisKm21klNo07pGEXo17kzyolNkbSX8H pQ0hnuTaxDiEgvxmFy9PjKEFmPuE/xCKEUAgcoQEKNis7uocnpI2C8kP7VNBZyJ4kIHX /YIGYbLPkSb46oYopj08RFZjBAT0PjJRA8W0eNryqMpZ+5b2JH53i14mFm1okKSkfDhv 75ng== X-Gm-Message-State: APjAAAVxMCttwPlzckcKKMeMIdkdmmZgzgyYy9HY9teceZcPGnvVHoX/ kFiiBDUCXgSrjp6+3s2Of9yspD9g X-Google-Smtp-Source: APXvYqzlHrKNysTzIEJgaRnJZ3JJdeGp2f2Olbc+ieRafYrENewspPwDOCZ/zZtK3/mYUiP2/DJ5AA== X-Received: by 2002:adf:e50d:: with SMTP id j13mr4099354wrm.165.1553207233280; Thu, 21 Mar 2019 15:27:13 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id 3sm8316632wrk.68.2019.03.21.15.27.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 15:27:12 -0700 (PDT) From: luca.boccassi@gmail.com To: netdev@vger.kernel.org Cc: alexei.starovoitov@gmail.com Subject: [PATCH bpf-next v5] tools/bpf: generate pkg-config file for libbpf Date: Thu, 21 Mar 2019 22:27:08 +0000 Message-Id: <20190321222708.28789-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190319210639.6282-1-bluca@debian.org> References: <20190319210639.6282-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Luca Boccassi Generate a libbpf.pc file at build time so that users can rely on pkg-config to find the library, its CFLAGS and LDFLAGS. Signed-off-by: Luca Boccassi Acked-by: Andrey Ignatov --- v2: use QUIET_GEN instead of QUIET_LINK to generate pc file, save kernel version in its own variable instead of calling make inline v3: use LIBBPF_VERSION instead of kernel_version v4: use -I${prefix}/include rather than -I${prefix}/include/bpf in the Cflags field as requested, to keep consistency with how the headers are used now and to avoid a dependency from the pc file to the headers installation v5: add acked-by, add SPDX line to pc file tools/lib/bpf/.gitignore | 1 + tools/lib/bpf/Makefile | 18 +++++++++++++++--- tools/lib/bpf/libbpf.pc.template | 13 +++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 tools/lib/bpf/libbpf.pc.template diff --git a/tools/lib/bpf/.gitignore b/tools/lib/bpf/.gitignore index 4db74758c674..7d9e182a1f51 100644 --- a/tools/lib/bpf/.gitignore +++ b/tools/lib/bpf/.gitignore @@ -1,3 +1,4 @@ libbpf_version.h +libbpf.pc FEATURE-DUMP.libbpf test_libbpf diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 61aaacf0cfa1..891fe3da1410 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -80,6 +80,7 @@ libdir_SQ = $(subst ','\'',$(libdir)) libdir_relative_SQ = $(subst ','\'',$(libdir_relative)) LIB_FILE = libbpf.a libbpf.so +PC_FILE = libbpf.pc VERSION = $(BPF_VERSION) PATCHLEVEL = $(BPF_PATCHLEVEL) @@ -137,7 +138,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \ VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) -CMD_TARGETS = $(LIB_FILE) +CMD_TARGETS = $(LIB_FILE) $(PC_FILE) CXX_TEST_TARGET = $(OUTPUT)test_libbpf @@ -180,6 +181,12 @@ $(OUTPUT)libbpf.a: $(BPF_IN) $(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a $(QUIET_LINK)$(CXX) $(INCLUDES) $^ -lelf -o $@ +$(OUTPUT)libbpf.pc: + $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \ + -e "s|@LIBDIR@|$(libdir_SQ)|" \ + -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ + < $@.template > $@ + check: check_abi check_abi: $(OUTPUT)libbpf.so @@ -209,7 +216,12 @@ install_headers: $(call do_install,libbpf.h,$(prefix)/include/bpf,644); $(call do_install,btf.h,$(prefix)/include/bpf,644); -install: install_lib +install_pkgconfig: $(PC_FILE) + $(call QUIET_INSTALL, $(PC_FILE)) \ + $(call do_install,$(PC_FILE),$(libdir_SQ)/pkgconfig,644) + + +install: install_lib install_pkgconfig ### Cleaning rules @@ -219,7 +231,7 @@ config-clean: clean: $(call QUIET_CLEAN, libbpf) $(RM) $(TARGETS) $(CXX_TEST_TARGET) \ - *.o *~ *.a *.so .*.d .*.cmd LIBBPF-CFLAGS + *.o *~ *.a *.so .*.d .*.cmd *.pc LIBBPF-CFLAGS $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf diff --git a/tools/lib/bpf/libbpf.pc.template b/tools/lib/bpf/libbpf.pc.template new file mode 100644 index 000000000000..73e9f321f84f --- /dev/null +++ b/tools/lib/bpf/libbpf.pc.template @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) + +prefix=@PREFIX@ +libdir=@LIBDIR@ +includedir=${prefix}/include + +Name: libbpf +URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git +Description: Linux kernel BPF library +Version: @VERSION@ +Libs: -L${libdir} -lbpf +Requires.private: libelf +Cflags: -I${includedir} -- 2.20.1