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

[PATCH v3 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 v2:
 - Add DESTDIR prefix.

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..97bc8ca 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 $(DESTDIR)$(PKG_INSTALLDIR)
+	$(INSTALL_DATA) xlutil.pc $(DESTDIR)$(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 v3 for-4.8] tools/configure: fix pkg-config install path for FreeBSD

[Wei Liu]

On Tue, Oct 25, 2016 at 11:53:28AM +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>

Acked-by: Wei Liu <wei.liu2@citrix.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 v2:
>  - Add DESTDIR prefix.
> 
> 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..97bc8ca 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 $(DESTDIR)$(PKG_INSTALLDIR)
> +	$(INSTALL_DATA) xlutil.pc $(DESTDIR)$(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 v3 for-4.8] tools/configure: fix pkg-config install path for FreeBSD

[Wei Liu]

On Tue, Oct 25, 2016 at 02:26:55PM +0100, Wei Liu wrote:
> On Tue, Oct 25, 2016 at 11:53:28AM +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>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>

Applied.

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

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

[Alexander Nusov]

[-- Attachment #1.1: Type: text/plain, Size: 1712 bytes --]

Hello,



I've reinstalled xen from ports on FreeBSD-11.0

and it seems xenlight.pc is not being installed to /usr/local/libdata/pkgconfig/ directory.



root@controller:/usr/ports/devel/libvirt # find /usr/ -type f -name xenlight.pc
/usr/local/share/pkgconfig/xenlight.pc
root@controller:/usr/ports/devel/libvirt #

Name  : xen
Version : 4.7.0_2

Name  : xen-tools
Version : 4.7.0_4

could you apply this fix for FreeBSD ports tree please?

original issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213744


--

Thanks,

Alex




---- On Wed, 26 Oct 2016 15:02:15 +0300Wei Liu <wei.liu2@citrix.com> wrote ----




On Tue, Oct 25, 2016 at 02:26:55PM +0100, Wei Liu wrote: 

> On Tue, Oct 25, 2016 at 11:53:28AM +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> 

> 

> Acked-by: Wei Liu <wei.liu2@citrix.com> 

 

Applied. 







[-- Attachment #1.2: Type: text/html, Size: 3039 bytes --]

[-- Attachment #2: Type: text/plain, Size: 127 bytes --]

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

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

[Wei Liu]

On Sat, Nov 19, 2016 at 03:59:08PM +0300, Alexander Nusov wrote:
> Hello,
> 
> 
> 
> I've reinstalled xen from ports on FreeBSD-11.0
> 
> and it seems xenlight.pc is not being installed to /usr/local/libdata/pkgconfig/ directory.
> 
> 
> 
> root@controller:/usr/ports/devel/libvirt # find /usr/ -type f -name xenlight.pc
> /usr/local/share/pkgconfig/xenlight.pc
> root@controller:/usr/ports/devel/libvirt #
> 
> Name  : xen
> Version : 4.7.0_2
> 
> Name  : xen-tools
> Version : 4.7.0_4
> 
> could you apply this fix for FreeBSD ports tree please?
> 
> original issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213744
> 
> 

FAOD this request should be sent to Roger, who maintains xen port in
FreeBSD.

Wei.

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

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

[Roger Pau Monne]

On Sat, Nov 19, 2016 at 03:59:08PM +0300, Alexander Nusov wrote:
> Hello,
> 
> 
> 
> I've reinstalled xen from ports on FreeBSD-11.0
> 
> and it seems xenlight.pc is not being installed to /usr/local/libdata/pkgconfig/ directory.
> 
> 
> 
> root@controller:/usr/ports/devel/libvirt # find /usr/ -type f -name xenlight.pc
> /usr/local/share/pkgconfig/xenlight.pc
> root@controller:/usr/ports/devel/libvirt #
> 
> Name  : xen
> Version : 4.7.0_2
> 
> Name  : xen-tools
> Version : 4.7.0_4
> 
> could you apply this fix for FreeBSD ports tree please?
> 
> original issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213744

Hello,

Sorry for the delay, this should be fixed in 
https://svnweb.freebsd.org/ports?view=revision&revision=427568 I hope the new 
binary packages will appear soon (over the weekend).

Roger.

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

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

[Alexander Nusov]

[-- Attachment #1.1: Type: text/plain, Size: 1072 bytes --]

Thanks!



--

alex




---- On Fri, 02 Dec 2016 19:16:33 +0300 Roger Pau Monne <roger.pau@citrix.com> wrote ----




On Sat, Nov 19, 2016 at 03:59:08PM +0300, Alexander Nusov wrote: 

> Hello, 

> 

> 

> 

> I've reinstalled xen from ports on FreeBSD-11.0 

> 

> and it seems xenlight.pc is not being installed to /usr/local/libdata/pkgconfig/ directory. 

> 

> 

> 

> root@controller:/usr/ports/devel/libvirt # find /usr/ -type f -name xenlight.pc 

> /usr/local/share/pkgconfig/xenlight.pc 

> root@controller:/usr/ports/devel/libvirt # 

> 

> Name : xen 

> Version : 4.7.0_2 

> 

> Name : xen-tools 

> Version : 4.7.0_4 

> 

> could you apply this fix for FreeBSD ports tree please? 

> 

> original issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213744 

 

Hello, 

 

Sorry for the delay, this should be fixed in 

https://svnweb.freebsd.org/ports?view=revision&revision=427568 I hope the new 

binary packages will appear soon (over the weekend). 

 

Roger. 







[-- Attachment #1.2: Type: text/html, Size: 2208 bytes --]

[-- Attachment #2: Type: text/plain, Size: 127 bytes --]

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