Re: [Libjit] [PATCH] Add pkg-config .pc files

[Aleksey Demakov]

Thanks, applied.

On Thu, Feb 8, 2018 at 8:11 AM, Tom Tromey <address@hidden> wrote:
> This adds .pc files for the various libraries to libjit.  This lets
> users of the library use pkg-config to compile and link against
> libjit.
> ---
>  .gitignore                     |  1 +
>  configure.ac                   |  5 +++++
>  jit/Makefile.am                |  2 ++
>  jit/libjit.pc.in               | 11 +++++++++++
>  jitdynamic/Makefile.am         |  2 ++
>  jitdynamic/libjitdynamic.pc.in | 12 ++++++++++++
>  jitplus/Makefile.am            |  2 ++
>  jitplus/libjitplus.pc.in       | 12 ++++++++++++
>  8 files changed, 47 insertions(+)
>  create mode 100644 jit/libjit.pc.in
>  create mode 100644 jitdynamic/libjitdynamic.pc.in
>  create mode 100644 jitplus/libjitplus.pc.in
>
> diff --git a/.gitignore b/.gitignore
> index c8fb052..9147279 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -3,6 +3,7 @@
>  *.a
>  *.lo
>  *.la
> +*.pc
>
>  .deps
>  .libs
> diff --git a/configure.ac b/configure.ac
> index 37969d4..149b748 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -17,6 +17,8 @@ dnl Set the version number for the shared libraries.
>  AC_SUBST(LIBJIT_VERSION)
>  LIBJIT_VERSION=0:1:0
>
> +PKG_INSTALLDIR
> +
>  dnl Determine the architecture.
>  AC_MSG_CHECKING([architecture])
>  AC_SUBST(JIT_ARCH)
> @@ -489,8 +491,11 @@ AC_CONFIG_FILES([
>    include/jit/jit-defs.h
>    tools/Makefile
>    jit/Makefile
> +  jit/libjit.pc
>    jitdynamic/Makefile
> +  jitdynamic/libjitdynamic.pc
>    jitplus/Makefile
> +  jitplus/libjitplus.pc
>    dpas/Makefile
>    tutorial/Makefile
>    tests/Makefile
> diff --git a/jit/Makefile.am b/jit/Makefile.am
> index 6fc5e5f..93b884e 100644
> --- a/jit/Makefile.am
> +++ b/jit/Makefile.am
> @@ -2,6 +2,8 @@ BUILT_SOURCES = jit-opcode.c jit-interp-opcode.h 
> jit-interp-opcode.c
>
>  lib_LTLIBRARIES = libjit.la
>
> +pkgconfig_DATA = libjit.pc
> +
>  libjit_la_SOURCES = \
>         jit-alloc.c \
>         jit-apply.c \
> diff --git a/jit/libjit.pc.in b/jit/libjit.pc.in
> new file mode 100644
> index 0000000..56a2ec4
> --- /dev/null
> +++ b/jit/libjit.pc.in
> @@ -0,0 +1,11 @@
> address@hidden@
> address@hidden@
> address@hidden@
> address@hidden@
> +
> +Name: libjit
> +Description: GNU Libjit - a just-in-time compiler library
> +URL: https://www.gnu.org/software/libjit/
> +Version: @VERSION@
> +Libs: -L${libdir} -ljit
> +Cflags: -I${includedir}
> diff --git a/jitdynamic/Makefile.am b/jitdynamic/Makefile.am
> index 272c03b..4465d9c 100644
> --- a/jitdynamic/Makefile.am
> +++ b/jitdynamic/Makefile.am
> @@ -1,6 +1,8 @@
>
>  lib_LTLIBRARIES = libjitdynamic.la
>
> +pkgconfig_DATA = libjitdynamic.pc
> +
>  libjitdynamic_la_SOURCES = \
>                 jit-dynlib.c \
>                 jit-cpp-mangle.c
> diff --git a/jitdynamic/libjitdynamic.pc.in b/jitdynamic/libjitdynamic.pc.in
> new file mode 100644
> index 0000000..e8769de
> --- /dev/null
> +++ b/jitdynamic/libjitdynamic.pc.in
> @@ -0,0 +1,12 @@
> address@hidden@
> address@hidden@
> address@hidden@
> address@hidden@
> +
> +Name: libjitdynamic
> +Description: Dynamic linking library for GNU Libjit
> +URL: https://www.gnu.org/software/libjit/
> +Version: @VERSION@
> +Requires: libjit
> +Libs: -L${libdir} -ljitplus
> +Cflags: -I${includedir}
> diff --git a/jitplus/Makefile.am b/jitplus/Makefile.am
> index 4a57a1d..b9e78b7 100644
> --- a/jitplus/Makefile.am
> +++ b/jitplus/Makefile.am
> @@ -1,6 +1,8 @@
>
>  lib_LTLIBRARIES = libjitplus.la
>
> +pkgconfig_DATA = libjitplus.pc
> +
>  libjitplus_la_SOURCES = \
>                 jit-plus-context.cpp \
>                 jit-plus-function.cpp \
> diff --git a/jitplus/libjitplus.pc.in b/jitplus/libjitplus.pc.in
> new file mode 100644
> index 0000000..3319b0b
> --- /dev/null
> +++ b/jitplus/libjitplus.pc.in
> @@ -0,0 +1,12 @@
> address@hidden@
> address@hidden@
> address@hidden@
> address@hidden@
> +
> +Name: libjitplus
> +Description: C++ wrapper for GNU Libjit
> +URL: https://www.gnu.org/software/libjit/
> +Version: @VERSION@
> +Requires: libjit
> +Libs: -L${libdir} -ljitplus -ljit
> +Cflags: -I${includedir}
> --
> 2.13.6
>
>