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=-8.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,SIGNED_OFF_BY, SPF_PASS,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 B0CD8C43381 for ; Thu, 21 Mar 2019 23:09:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 769AC21917 for ; Thu, 21 Mar 2019 23:09:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rgYFHJI2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727124AbfCUXJw (ORCPT ); Thu, 21 Mar 2019 19:09:52 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33015 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726529AbfCUXJw (ORCPT ); Thu, 21 Mar 2019 19:09:52 -0400 Received: by mail-wr1-f65.google.com with SMTP id q1so390947wrp.0 for ; Thu, 21 Mar 2019 16:09:50 -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=nBgNbMjfvTHEptTGaslcGFvE2bWTfZ6KXnLd1RKDuKw=; b=rgYFHJI25JJzkeBsE6fLe95rLSyRmqhVwmSgOCLKyNcM9RrPqEK5eDTA2cGitJW/N7 p9xuwP314nsVO7SfeQTkFLW3NL7ejLbHeUiPkJKXiSti/cueDTcgmPmYkNhBPMItKoaI /xGnLokHJwgw6Csc3pxdVddFJ84sygwLi46ofppaRhlH32iChS1E4USlP4S5yAR8Bjqd IjQesVsQ0eogsajmihHruaBnOURz7lW4LY7Vaw0AYVhko4Q3ytldP82a8R7IkEsbU9f3 VlSMyfyY7PiPUG8BmVrdPxzvWT/f5vRRyxDgB2pnpnwpwFoYF3d6R3JwYtQLL75PsTC8 dn6Q== 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=nBgNbMjfvTHEptTGaslcGFvE2bWTfZ6KXnLd1RKDuKw=; b=P/+6Pv/ian/iN0Q0QnaHaar51LXMa0yAv90eP7KBi2iSYTzTWT8lVeAnxkOfCBlmif bs/Ch/T++S4jxjMHktIr8eV2Uu/Qfyptk3CP+uTpG1IkziaLdL6/AgE1CC8A8Qppg7AM M1/eyFuJUV5q9dIsZDMy6RzveZblceLYgeI5CqAM3ls1TIlM+nwr1qq8M+gTl+SzbpyA nNd9tHeILIMRS8d8us00tYHZKQ5rMxdrHd1WOIgiCKTqgNAI3f9vHvO8McmYrGA+tggP uRi4dHPEv0Gyr3ELYpHETGnU/gFWcFmJ1xmk3tY2Gi8khuoTirWZqjGQxmWHlHSSSxAd lpEA== X-Gm-Message-State: APjAAAUMB/yNWMvmvuGMg7u+sV4bboKi/VpF2ZuiWOI2y0S8STrMXgHR 3/efqJI/rJ0gvq5oLRcUBiLjZV+F X-Google-Smtp-Source: APXvYqx09y4DkOAOSFu+fKfdWDYuuKupvUGH2h1r7eusxI0xa/ZLQ6J34uSXssRs7c4fcEkGPKfXeA== X-Received: by 2002:adf:eb85:: with SMTP id t5mr4251270wrn.168.1553209789751; Thu, 21 Mar 2019 16:09:49 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id p12sm4528519wrt.4.2019.03.21.16.09.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 16:09:48 -0700 (PDT) From: luca.boccassi@gmail.com To: netdev@vger.kernel.org Cc: alexei.starovoitov@gmail.com, daniel@iogearbox.net Subject: [PATCH bpf-next v7] tools/bpf: generate pkg-config file for libbpf Date: Thu, 21 Mar 2019 23:09:44 +0000 Message-Id: <20190321230944.4723-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 v6: remove URL field, generalize Description field v7: fix build with make OUTPUT=/foo/bar/ by prefixing $(OUTPUT) to the pc file variable tools/lib/bpf/.gitignore | 1 + tools/lib/bpf/Makefile | 19 ++++++++++++++++--- tools/lib/bpf/libbpf.pc.template | 12 ++++++++++++ 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..96e9571b0a2e 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) @@ -130,6 +131,7 @@ include $(srctree)/tools/build/Makefile.include BPF_IN := $(OUTPUT)libbpf-in.o LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE)) +PC_FILE := $(addprefix $(OUTPUT),$(PC_FILE)) VERSION_SCRIPT := libbpf.map GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN) | \ @@ -137,7 +139,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 +182,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)|" \ + < libbpf.pc.template > $@ + check: check_abi check_abi: $(OUTPUT)libbpf.so @@ -209,7 +217,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 +232,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..ac17fcef2108 --- /dev/null +++ b/tools/lib/bpf/libbpf.pc.template @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) + +prefix=@PREFIX@ +libdir=@LIBDIR@ +includedir=${prefix}/include + +Name: libbpf +Description: BPF library +Version: @VERSION@ +Libs: -L${libdir} -lbpf +Requires.private: libelf +Cflags: -I${includedir} -- 2.20.1