[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-keyrings
Subject:    Re: [PATCH] keyutils: Add pkg-config file for keyutils library
From:       Dave Jiang <dave.jiang () intel ! com>
Date:       2018-07-27 19:31:15
Message-ID: 15d5f116-b155-5b73-4352-e7b92adf8b82 () intel ! com
[Download RAW message or body]

David, any issues with this patch?

On 07/13/2018 01:12 PM, Dave Jiang wrote:
> This is needed so that other projects can add a dependency on libkeyutils via
> PKG_CHECK_MODULES([KEYUTILS], [keyutils]).  This enabling makes 'make install'
> do the right thing, and of course individual distros will need to add enabling
> to their associated packages (rpm, deb, etc.) so the package manager
> installs do the right thing.
> 
> Signed-off-by: Dave Jiang <dave.jiang@intel.com>
> ---
>  Makefile       |   13 +++++++++++++
>  keyutils.pc.in |   10 ++++++++++
>  keyutils.spec  |    1 +
>  3 files changed, 24 insertions(+)
>  create mode 100644 keyutils.pc.in
> 
> diff --git a/Makefile b/Makefile
> index 824bbbf..e2976ad 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -19,6 +19,7 @@ MAN8		:= $(MANDIR)/man8
>  INCLUDEDIR	:= /usr/include
>  LN		:= ln
>  LNS		:= $(LN) -sf
> +PREFIX 		:= /usr
>  
>  ###############################################################################
>  #
> @@ -78,6 +79,9 @@ endif
>  endif
>  endif
>  
> +PKGCONFIG 	:= keyutils.pc
> +PKGCONFIG_DIR 	:= $(USRLIBDIR)/pkgconfig
> +
>  ###############################################################################
>  #
>  # This is necessary if glibc doesn't know about the key management error codes
> @@ -168,6 +172,15 @@ ifeq ($(NO_SOLIB),0)
>  	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
>  	mkdir -p $(DESTDIR)$(USRLIBDIR)
>  	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
> +	sed \
> +	-e 's,@VERSION\@,$(VERSION),g' \
> +	-e 's,@prefix\@,$(PREFIX),g' \
> +	-e 's,@exec_prefix\@,$(PREFIX),g' \
> +	-e 's,@libdir\@,$(USRLIBDIR),g' \
> +	-e 's,@includedir\@,$(INCLUDEDIR),g' \
> +	< $(PKGCONFIG).in > $(PKGCONFIG) || rm $(PKGCONFIG)
> +	$(INSTALL) -D $(PKGCONFIG) $(PKGCONFIG_DIR)/$(PKGCONFIG)
> +	rm $(PKGCONFIG)
>  endif
>  	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
>  	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
> diff --git a/keyutils.pc.in b/keyutils.pc.in
> new file mode 100644
> index 0000000..44fd6e1
> --- /dev/null
> +++ b/keyutils.pc.in
> @@ -0,0 +1,10 @@
> +prefix=@prefix@
> +exec_prefix=@exec_prefix@
> +libdir=@libdir@
> +includedir=@includedir@
> +
> +Name: keyutils
> +Description: keyutils library
> +Version: @VERSION@
> +Cflags: -I${includedir}
> +Libs: -L${libdir} -lkeyutils
> diff --git a/keyutils.spec b/keyutils.spec
> index 1cbcf86..0e446ad 100644
> --- a/keyutils.spec
> +++ b/keyutils.spec
> @@ -100,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
>  %{_mandir}/man7/*
>  %{_libdir}/libkeyutils.so.%{libapiversion}
>  %{_libdir}/libkeyutils.so.%{libapivermajor}
> +%{_libdir}/pkgconfig/keyutils.pc
>  
>  %files libs-devel
>  %defattr(-,root,root,-)
> 
--
To unsubscribe from this list: send the line "unsubscribe keyrings" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]