[PATCH v2 for-4.8] tools/configure: fix pkg-config install path for FreeBSD

[PATCH v2 for-4.8] tools/configure: fix pkg-config install path for FreeBSD

[Roger Pau Monne]

pkg-config from FreeBSD ports doesn't have ${prefix}/share/pkgconfig in the
default search path, fix this by having a PKG_INSTALLDIR variable that can
be changed on a per-OS basis.

It would be best to use PKG_INSTALLDIR as defined by the pkg.m4 macro, but
sadly this also reports a wrong value on FreeBSD (${libdir}/pkgconfig, which
expands to /usr/local/lib/pkgconfig by default, and is also _not_ part of
the default pkg-config search path).

This patch should not change the behavior for Linux installs.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reported-by: Alexander Nusov <alexander.nusov@nfvexpress.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Alexander Nusov <alexander.nusov@nfvexpress.com>
---
Changes since v1:
 - Remove leftovers from a previous attempt at fixing the issue.
---
 config/FreeBSD.mk    | 1 +
 config/Paths.mk.in   | 2 ++
 tools/libxl/Makefile | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk
index bb3a5d0..afeaefb 100644
--- a/config/FreeBSD.mk
+++ b/config/FreeBSD.mk
@@ -2,3 +2,4 @@ include $(XEN_ROOT)/config/StdGNU.mk
 
 # No wget on FreeBSD base system
 WGET = ftp
+PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig
diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 62cea48..a603295 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -56,3 +56,5 @@ XENFIRMWAREDIR           := @XENFIRMWAREDIR@
 
 XEN_CONFIG_DIR           := @XEN_CONFIG_DIR@
 XEN_SCRIPT_DIR           := @XEN_SCRIPT_DIR@
+
+PKG_INSTALLDIR           := ${SHAREDIR}/pkgconfig
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index a3c0af8..6d323ef 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -297,8 +297,8 @@ install: all
 	$(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir)
 	$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
-	$(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
-	$(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
+	$(INSTALL_DATA) xenlight.pc $(PKG_INSTALLDIR)
+	$(INSTALL_DATA) xlutil.pc $(PKG_INSTALLDIR)
 
 .PHONY: clean
 clean:
-- 
2.7.4 (Apple Git-66)


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH v2 for-4.8] tools/configure: fix pkg-config install path for FreeBSD

[Wei Liu]

On Tue, Oct 25, 2016 at 11:37:16AM +0200, Roger Pau Monne wrote:
> pkg-config from FreeBSD ports doesn't have ${prefix}/share/pkgconfig in the
> default search path, fix this by having a PKG_INSTALLDIR variable that can
> be changed on a per-OS basis.
> 
> It would be best to use PKG_INSTALLDIR as defined by the pkg.m4 macro, but
> sadly this also reports a wrong value on FreeBSD (${libdir}/pkgconfig, which
> expands to /usr/local/lib/pkgconfig by default, and is also _not_ part of
> the default pkg-config search path).
> 
> This patch should not change the behavior for Linux installs.
> 
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Reported-by: Alexander Nusov <alexander.nusov@nfvexpress.com>
> ---
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> Cc: Alexander Nusov <alexander.nusov@nfvexpress.com>
> ---
> Changes since v1:
>  - Remove leftovers from a previous attempt at fixing the issue.

Right, this looks better.

I was in the middle of writing comments for v1 when you said you were to
send out v2. :-)

> ---
>  config/FreeBSD.mk    | 1 +
>  config/Paths.mk.in   | 2 ++
>  tools/libxl/Makefile | 4 ++--
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk
> index bb3a5d0..afeaefb 100644
> --- a/config/FreeBSD.mk
> +++ b/config/FreeBSD.mk
> @@ -2,3 +2,4 @@ include $(XEN_ROOT)/config/StdGNU.mk
>  
>  # No wget on FreeBSD base system
>  WGET = ftp
> +PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig
> diff --git a/config/Paths.mk.in b/config/Paths.mk.in
> index 62cea48..a603295 100644
> --- a/config/Paths.mk.in
> +++ b/config/Paths.mk.in
> @@ -56,3 +56,5 @@ XENFIRMWAREDIR           := @XENFIRMWAREDIR@
>  
>  XEN_CONFIG_DIR           := @XEN_CONFIG_DIR@
>  XEN_SCRIPT_DIR           := @XEN_SCRIPT_DIR@
> +
> +PKG_INSTALLDIR           := ${SHAREDIR}/pkgconfig
> diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
> index a3c0af8..6d323ef 100644
> --- a/tools/libxl/Makefile
> +++ b/tools/libxl/Makefile
> @@ -297,8 +297,8 @@ install: all
>  	$(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir)
>  	$(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir)
>  	$(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
> -	$(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
> -	$(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/
> +	$(INSTALL_DATA) xenlight.pc $(PKG_INSTALLDIR)
> +	$(INSTALL_DATA) xlutil.pc $(PKG_INSTALLDIR)
>  

Did you miss $(DESTDIR)?

Wei.

>  .PHONY: clean
>  clean:
> -- 
> 2.7.4 (Apple Git-66)
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel