All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/1] package/qt5/qt5base: fix PKG_CONFIG_LIBDIR
@ 2018-08-02 18:09 Bernd Kuhls
  2018-08-05 10:55 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2018-08-02 18:09 UTC (permalink / raw)
  To: buildroot

By default pkgconf searches "${libdir}/pkgconfig:${datadir}/pkgconfig"
for .pc files:
https://github.com/pkgconf/pkgconf/blob/844f0a66621629a65e3cbf3c3ca47185602e9df5/configure.ac#L41

The new xorgproto package installs .pc files to ${datadir}/pkgconfig
whichs translates to $(STAGING_DIR)/usr/share/pkgconfig, for example
dri3proto:
https://cgit.freedesktop.org/xorg/proto/xorgproto/tree/Makefile.am#n65

whereas the old xproto_ packages installed their .pc files to
${libdir}/pkgconfig:
https://cgit.freedesktop.org/xorg/proto/dri3proto/tree/Makefile.am?id=3937f72040b79c7245b261da880364177cc40a6e#n4

Normally this upstream change is not a problem because pkgconf searches
both paths for .pc files, unless we define PKG_CONFIG_LIBDIR with
something else like we did for the last six years ;)
https://github.com/buildroot/buildroot/blame/master/package/qt5/qt5base/qt5base.mk#L280

This patch removes all variables concerning pkgconf paths. At the time
the qt5base package was introduced the pkgconf wrapper did not exist.
Today these variables are not necessary anymore.

Fixes
http://autobuild.buildroot.net/results/061/06159500c27026d56a772fafbb0d956c72dd4e6c/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: Removed PKG_CONFIG_* variables (Thomas)

 package/qt5/qt5base/qt5base.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 9eafd593f1..ab2b883fc4 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -277,8 +277,6 @@ define QT5BASE_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \
 		./configure \
 		-v \
-- 
2.18.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [Buildroot] [PATCH v2 1/1] package/qt5/qt5base: fix PKG_CONFIG_LIBDIR
  2018-08-02 18:09 [Buildroot] [PATCH v2 1/1] package/qt5/qt5base: fix PKG_CONFIG_LIBDIR Bernd Kuhls
@ 2018-08-05 10:55 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-08-05 10:55 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  2 Aug 2018 20:09:44 +0200, Bernd Kuhls wrote:
> By default pkgconf searches "${libdir}/pkgconfig:${datadir}/pkgconfig"
> for .pc files:
> https://github.com/pkgconf/pkgconf/blob/844f0a66621629a65e3cbf3c3ca47185602e9df5/configure.ac#L41
> 
> The new xorgproto package installs .pc files to ${datadir}/pkgconfig
> whichs translates to $(STAGING_DIR)/usr/share/pkgconfig, for example
> dri3proto:
> https://cgit.freedesktop.org/xorg/proto/xorgproto/tree/Makefile.am#n65
> 
> whereas the old xproto_ packages installed their .pc files to
> ${libdir}/pkgconfig:
> https://cgit.freedesktop.org/xorg/proto/dri3proto/tree/Makefile.am?id=3937f72040b79c7245b261da880364177cc40a6e#n4
> 
> Normally this upstream change is not a problem because pkgconf searches
> both paths for .pc files, unless we define PKG_CONFIG_LIBDIR with
> something else like we did for the last six years ;)
> https://github.com/buildroot/buildroot/blame/master/package/qt5/qt5base/qt5base.mk#L280
> 
> This patch removes all variables concerning pkgconf paths. At the time
> the qt5base package was introduced the pkgconf wrapper did not exist.
> Today these variables are not necessary anymore.
> 
> Fixes
> http://autobuild.buildroot.net/results/061/06159500c27026d56a772fafbb0d956c72dd4e6c/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: Removed PKG_CONFIG_* variables (Thomas)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-08-05 10:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-02 18:09 [Buildroot] [PATCH v2 1/1] package/qt5/qt5base: fix PKG_CONFIG_LIBDIR Bernd Kuhls
2018-08-05 10:55 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.