From patchwork Wed Mar 20 13:28:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 1059183 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MnwcefIt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44PW340QN0z9sPF for ; Thu, 21 Mar 2019 00:28:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727137AbfCTN2p (ORCPT ); Wed, 20 Mar 2019 09:28:45 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35836 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725905AbfCTN2p (ORCPT ); Wed, 20 Mar 2019 09:28:45 -0400 Received: by mail-wm1-f68.google.com with SMTP id y197so2054203wmd.0 for ; Wed, 20 Mar 2019 06:28:44 -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=PECRFa3aTywtxX3IrJ3dy5AjVa+aF0IpVfSOOdohZWE=; b=MnwcefItBVOxNP4fgc9sdXwFn9a4CULPZ8GmfVgIfvqeduSqCXM0d8Q2HpjFNJl+Ij 75x8LeGVboAEbwvUsG2WysoiQVvjjMUVTXUILEAGNIoTRjjEImcThs69nQTITIjykhPb 7Vd2fiBS5Lybp3fAya0RwuQP+jQDdUW3E5uP7aecl550HkYgiPHPkAjCS9MSuMwu2e8s B32Ee+yJJyV0qG+zncJ6XqyqNbDzTW3vgm7oWhCvkV4tC89Wnn2TlqmMNn2Rf8Yhwqs6 guhawmk8vs0mKCrD8Q8Ut7mrFZQhlKc0WkYyIJbBb3QkBzCsnFJ6n195+yZnhcoalKri I1ww== 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=PECRFa3aTywtxX3IrJ3dy5AjVa+aF0IpVfSOOdohZWE=; b=FNh32bUo3fGd9avCq4jaxY58doiYKSRdidsOwRuHieniybP32JxDA5aqvyD3+4nlyP Lm9GaiNX/W8KxDFhqSFz22K3rL9MQDv4FThrSu072MbGaXK2O+mDYMGX+XDwsrTqKMZr IXmwsV4FRgGNm2AR9UWPggW0BaXXpzmbI+UdZxWEbRR1l0OvY66poVDfatmbNBQubvQx 8xQbvVvsYMS6hg3JvYIPSyjez08ubxGwNS0LytN6B0jbftubtDfl28PrTUp2VVxTSk/S tILbIMj5R2HeqTOJHwQg/kzTwcA9VzLj0TkMyhAPuv1o3VUj2Df8NmM/xc8aMIPZj9Ni 4PMQ== X-Gm-Message-State: APjAAAV6muevJRBtVUCu1qo0Qelnp3pTDi4hq7Yz9n2ieq5rGTq7aftl y1B+M0nwqO784q23+6tyoKmqJeBq0iR/+A== X-Google-Smtp-Source: APXvYqzqPjNTDuWTrRGTPzcIZQWcLK89WPKtGCXNcElyvzwSAMu0fI2d3l0+ZTDaOUnpgyizb1RNCg== X-Received: by 2002:a1c:f503:: with SMTP id t3mr8262935wmh.71.1553088523029; Wed, 20 Mar 2019 06:28:43 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id q5sm2284714wrn.43.2019.03.20.06.28.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 06:28:41 -0700 (PDT) From: luca.boccassi@gmail.com To: netdev@vger.kernel.org Cc: sdf@fomichev.me Subject: [PATCH bpf-next v3] tools/bpf: generate pkg-config file for libbpf Date: Wed, 20 Mar 2019 13:28:28 +0000 Message-Id: <20190320132828.30131-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 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 --- 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 tools/lib/bpf/.gitignore | 1 + tools/lib/bpf/Makefile | 18 +++++++++++++++--- tools/lib/bpf/libbpf.pc.template | 11 +++++++++++ 3 files changed, 27 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..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}