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 D5900C43381 for ; Thu, 21 Mar 2019 10:25:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F0B2218D8 for ; Thu, 21 Mar 2019 10:25:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W/bStWJI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728044AbfCUKZm (ORCPT ); Thu, 21 Mar 2019 06:25:42 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43080 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727575AbfCUKZm (ORCPT ); Thu, 21 Mar 2019 06:25:42 -0400 Received: by mail-wr1-f68.google.com with SMTP id d17so5919637wre.10 for ; Thu, 21 Mar 2019 03:25:41 -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=ks0g66FxDlTUpPnxsG0cxEUjQzuqmVlH/Ae6Z0mls7c=; b=W/bStWJIykQ3MuGmK0gq4s9wm8LPqKdXq0SuwitpSULQmOf3njkoQHHkCqr3/ryL6c DXzm1G4F1+jy9PdjPPaPMuWpVGEB9pLX3kc+f3m53PUZ6C3edofhSBrYnEO7md8UXFB5 nUvnAbP44xrvfVWv+8aIiIDmyQuZwooZU8j5Ksf78bWGBIEKrg7oVFqVGUsPxpEnwLRM 397DLLDjZBKIbgoF1b3rSb3uRVODU5RDLKqXe8CHc1mWyppZ99wgH/bp6OYPknRKUg/7 9himf0vg+Dm5x4Wss3w1UUNUbrhzdTYSgWW8sC1XQceYjRKWHuSMKb3ZZe1WXPlHbpBS soGQ== 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=ks0g66FxDlTUpPnxsG0cxEUjQzuqmVlH/Ae6Z0mls7c=; b=ho4q+nP547GNUuoWBJS3o5WTx3pSrp/1cx9g+/+k57xeDWJ+2kpNe0yU1fbnZoWump yszIWCYv85TnBRgZynQi+14SxLj+oA0Dw47EeXljMcS0v5ie4H0R6PHwQQl69/AvsAbU ZV3TVOGVJCiIH5O/ab0LgXNd+GPjYCUXCTyKoq9MsRC9LRmHwh5g6r+0wLt4kKnvwul2 rNmJk2sr0iS/E6CA/bNs8eeW+TGzNZTPNLpEwO8QZVPOwbj5CryoX8VKyPauDvlx9w/Y 7CiDz5h/gyk9jz8/hcGMyh5V9BBEvIKVu6DJK3TGn4e4RKSfW+xwTiUE5ueAZi1UkqNP 6W4Q== X-Gm-Message-State: APjAAAV5lVax+L1aqzyZZZhs47Q5BgXxkJhTXJLm/F7ndjQpMfRTp+Vk lzDdBqhBxG8urqYNy+nH50Bvepi8ZoE= X-Google-Smtp-Source: APXvYqzUaZtteJT/an5qJLerl02G7u5Xqd1kiEMZZ53XKPrYZpaFE/HqNs1f5BvnV0iR5LeNi7b/2A== X-Received: by 2002:adf:f147:: with SMTP id y7mr1909999wro.102.1553163940068; Thu, 21 Mar 2019 03:25:40 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:b00c:66c8:99df:336]) by smtp.gmail.com with ESMTPSA id l12sm5997145wrt.31.2019.03.21.03.25.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 03:25:39 -0700 (PDT) From: luca.boccassi@gmail.com To: netdev@vger.kernel.org Cc: rdna@fb.com Subject: [PATCH bpf-next v4] tools/bpf: generate pkg-config file for libbpf Date: Thu, 21 Mar 2019 10:25:31 +0000 Message-Id: <20190321102531.31810-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 --- 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 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..0ecd334c109f --- /dev/null +++ b/tools/lib/bpf/libbpf.pc.template @@ -0,0 +1,11 @@ +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