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=-14.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,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 AD1E7C43381 for ; Tue, 19 Mar 2019 23:00:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8241E2175B for ; Tue, 19 Mar 2019 23:00:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726908AbfCSXA5 (ORCPT ); Tue, 19 Mar 2019 19:00:57 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:40730 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726741AbfCSXA5 (ORCPT ); Tue, 19 Mar 2019 19:00:57 -0400 Received: by mail-wr1-f49.google.com with SMTP id t5so648906wri.7 for ; Tue, 19 Mar 2019 16:00:56 -0700 (PDT) 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=bhbhokyWQv4LFYakbW1Kdf6KgHsunlOkwfu3b5vkTqU=; b=DlcXcHikMZ/Cr31kn6koZg+5Fyq/I02PT65JOtC9pZMsLrDvQahhkeK9D9LfNb0JCg GPpjpFrrcD0KJVoJDHlvnSYe+bwiLpwIIL47Ectu2lSjWRoDbZ0HVvqlKWAo6TBUH3do ISXCz2p77XqDU2qh/zAmpri6q7kBdnK3NK5uF3th/3sZNSZVW8S7skSEY+5LWnwlbxXj 7Tlxwuylbx/5ItEBN/IMCzynrDrIHrra2LpOoIDklq9xn/9bdCTQ8BTOqegvAeYS5WMF WEMvI+HkUfaMButG1aQylmvxNa7uSjYGav2RzMcomFquinpI35nLPsfs1Ga/di78VGIJ 7HSQ== X-Gm-Message-State: APjAAAV5IwDLAGWYWtwNARzOPdP7bytguKBRLgDVdBnt7SsblbzHw3y0 TMf/G8eZuxzPlr3PfuPusWPITbiErw4= X-Google-Smtp-Source: APXvYqzXzkiL0vNG/xkSeyVPGsysVcIIxvWw/HC1FWmPe5ub/HsgqGFkm4yoKMFi74rF0WqV3CU4Zw== X-Received: by 2002:adf:dd4a:: with SMTP id u10mr7668558wrm.322.1553036455013; Tue, 19 Mar 2019 16:00:55 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:1cc6:1349:f313:ae0f]) by smtp.gmail.com with ESMTPSA id l3sm305316wmh.3.2019.03.19.16.00.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2019 16:00:53 -0700 (PDT) From: Luca Boccassi To: netdev@vger.kernel.org Cc: sdf@fomichev.me Subject: [PATCH bpf-next v2] tools/bpf: generate pkg-config file for libbpf Date: Tue, 19 Mar 2019 23:00:42 +0000 Message-Id: <20190319230042.32087-1-bluca@debian.org> 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 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 --- v2: use QUIET_GEN instead of QUIET_LINK to generate pc file, save kernel version in its own variable instead of calling make inline tools/lib/bpf/.gitignore | 1 + tools/lib/bpf/Makefile | 19 ++++++++++++++++--- tools/lib/bpf/libbpf.pc.template | 11 +++++++++++ 3 files changed, 28 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 a05c43468bd0..1df3ebfb3118 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) @@ -89,6 +90,7 @@ OBJ = $@ N = LIBBPF_VERSION = $(BPF_VERSION).$(BPF_PATCHLEVEL).$(BPF_EXTRAVERSION) +KERNEL_VERSION = $(shell make --no-print-directory -sC ../../.. kernelversion) # Set compile option CFLAGS ifdef EXTRA_CFLAGS @@ -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 @@ -179,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@|$(KERNEL_VERSION)|" \ + < $@.template > $@ + check: check_abi check_abi: $(OUTPUT)libbpf.so @@ -208,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 @@ -218,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..0cac2f5f54a6 --- /dev/null +++ b/tools/lib/bpf/libbpf.pc.template @@ -0,0 +1,11 @@ +prefix=@PREFIX@ +libdir=@LIBDIR@ +includedir=${prefix}/include/bpf + +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