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.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT 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 E5D52C43381 for ; Tue, 19 Mar 2019 23:17:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABC2B20857 for ; Tue, 19 Mar 2019 23:17:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=fomichev-me.20150623.gappssmtp.com header.i=@fomichev-me.20150623.gappssmtp.com header.b="zUF09KZT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbfCSXRQ (ORCPT ); Tue, 19 Mar 2019 19:17:16 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38997 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726875AbfCSXRQ (ORCPT ); Tue, 19 Mar 2019 19:17:16 -0400 Received: by mail-pf1-f193.google.com with SMTP id i17so456079pfo.6 for ; Tue, 19 Mar 2019 16:17:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fomichev-me.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=FZe+ZQASCNT44vhrlB+4CnmmbmoFq8vvxRB7AndF/po=; b=zUF09KZTR1E4AuucRVIAngbrCbajMgtsCyJuxQAp07et+hI2cBv1AI2Uomg5ugQM8l udD7Dh3ffoUwLZMPRKb5kABfiNYWXkwlAU2Fs2sDV69e0WvHqkflL1prB0oLNyYbUmQe 1E2K/NEXwqjlbwE0nB6nPQTmUV4kc7lLHtzwrQIlhhmOUkL5JyrthwqnWvoblKt/2fJw 6jmNWVrgcvgfDL9d8rQ8YLLc5MGt7NTn5iGBDG/bkfeLVz8hjlhUZ+YUU0lHcye9jT8s GLBBpisdqIj49xCVN2fJ8R372zeaKyOEF+NStOAzaTBGoaIDgYCYQYC2v1l9fPVFijyM 9iYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=FZe+ZQASCNT44vhrlB+4CnmmbmoFq8vvxRB7AndF/po=; b=DUN1HLaNXs+nr+sFuyh6rREnCwY1vPk/Kyc7fJoIInzv5U22lbZjx3V4VcF7Fj3czG feRoImHDUZSOY6CU2cDSsn+Q7bgHvT33AhdbHvGYdB0Ocme042ZVWnR/Bo46hjCqrgLr 8JO6kEmRjzzK9o26y8hO5PI8bILZr4gOA6lQts5k33QMLs9lDTuzxUWnASXp4XyooMdP YmDnvHctuP1btddDjzoOPNIqe6jpTpqtDd0QU3ngcdeo7FcXdromNFnkEvmH7RFpPtxR /g6fieG7PXMKXgM0+3hDFZxG9C2c1Mcx3ABOWVuIX269qqAlb2TKJ4pUVTYiYEHEnofC dYow== X-Gm-Message-State: APjAAAU2lvuDQwhlpzXhvsZ9lDMKEOVv+w3tyLC9p5KWXS+53hqMACOc CyWx+ztoc9eStnWI2pYt9twZLcnU1P0= X-Google-Smtp-Source: APXvYqxY25CQc6ETTqLiUMJp9y+Y2cdyoOnOhT+HRu7JTRxWCBj9KXxS4+I9BnbtP++h6V4rtgyWyg== X-Received: by 2002:aa7:8005:: with SMTP id j5mr4405195pfi.211.1553037435257; Tue, 19 Mar 2019 16:17:15 -0700 (PDT) Received: from localhost ([2601:646:8f00:18d9:d0fa:7a4b:764f:de48]) by smtp.gmail.com with ESMTPSA id 13sm98798pgq.66.2019.03.19.16.17.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Mar 2019 16:17:14 -0700 (PDT) Date: Tue, 19 Mar 2019 16:17:13 -0700 From: Stanislav Fomichev To: Luca Boccassi Cc: netdev@vger.kernel.org Subject: Re: [PATCH bpf-next v2] tools/bpf: generate pkg-config file for libbpf Message-ID: <20190319231713.GG7431@mini-arch.hsd1.ca.comcast.net> References: <20190319210639.6282-1-bluca@debian.org> <20190319230042.32087-1-bluca@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190319230042.32087-1-bluca@debian.org> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 03/19, Luca Boccassi wrote: > 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) Oh, we do already have LIBBPF_VERSION, why not use that? This way you don't need to do anything for out-of-tree libbpf from github. I don't remember what was the strategy regarding libbpf versioning, but that 0.0.1 should be changed to something sensible (be set to the kernel version upon release?) > > # 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 >