[Buildroot] [PATCH] package/nvidia-driver: don't install gl.pc when not providing libgl

[Buildroot] [PATCH] package/nvidia-driver: don't install gl.pc when not providing libgl

[Yann E. MORIN]

When nvidia-driver does not provide libgl (i.e. when it does not install
the X.org driver), it should also not install gl.pc, otherwise, packages
that depend on pkg-config will mis-detect presence of GL and fail to
build, like vlc:

    http://autobuild.buildroot.org/results/724/724fce8ce51c2c0578192b1369a1cfcea3d72638/

So, only install gl.pc when we install the X.org driver. Similarly, we
do not need to install libGL.la either.

Reported-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/nvidia-driver/nvidia-driver.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index a85cc1c..71babfb 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -40,6 +40,15 @@ NVIDIA_DRIVER_LIBS = \
 	libvdpau libvdpau_nvidia \
 	libnvidia-ml
 
+# Install the gl.pc file
+define NVIDIA_DRIVER_INSTALL_GL_DEV
+	$(INSTALL) -D -m 0644 $(@D)/libGL.la $(STAGING_DIR)/usr/lib/libGL.la
+	$(SED) 's:__GENERATED_BY__:Buildroot:' $(STAGING_DIR)/usr/lib/libGL.la
+	$(SED) 's:__LIBGL_PATH__:/usr/lib:' $(STAGING_DIR)/usr/lib/libGL.la
+	$(SED) 's:-L[^[:space:]]\+::' $(STAGING_DIR)/usr/lib/libGL.la
+	$(INSTALL) -D -m 0644 package/nvidia-driver/gl.pc $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
+endef
+
 # Those libraries are 'private' libraries requiring an agreement with
 # NVidia to develop code for those libs. There seems to be no restriction
 # on using those libraries (e.g. if the user has such an agreement, or
@@ -154,11 +163,7 @@ endef
 # For staging, install libraries and development files
 define NVIDIA_DRIVER_INSTALL_STAGING_CMDS
 	$(call NVIDIA_DRIVER_INSTALL_LIBS,$(STAGING_DIR))
-	$(INSTALL) -D -m 0644 $(@D)/libGL.la $(STAGING_DIR)/usr/lib/libGL.la
-	$(SED) 's:__GENERATED_BY__:Buildroot:' $(STAGING_DIR)/usr/lib/libGL.la
-	$(SED) 's:__LIBGL_PATH__:/usr/lib:' $(STAGING_DIR)/usr/lib/libGL.la
-	$(SED) 's:-L[^[:space:]]\+::' $(STAGING_DIR)/usr/lib/libGL.la
-	$(INSTALL) -D -m 0644 package/nvidia-driver/gl.pc $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
+	$(NVIDIA_DRIVER_INSTALL_GL_DEV)
 endef
 
 # For target, install libraries and X.org modules
-- 
1.9.1

[Buildroot] [PATCH] package/nvidia-driver: don't install gl.pc when not providing libgl

[Bernd Kuhls]

"Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
news:1429911597-19411-1-git-send-email-yann.morin.1998 at free.fr: 

> When nvidia-driver does not provide libgl (i.e. when it does not install
> the X.org driver), it should also not install gl.pc, otherwise, packages
> that depend on pkg-config will mis-detect presence of GL and fail to
> build, like vlc:
> 
>     http://autobuild.buildroot.org/results/724/724fce8ce51c2c0578192b1369
>     a1cfcea3d72638/ 
> 
> So, only install gl.pc when we install the X.org driver. Similarly, we
> do not need to install libGL.la either.
> 
> Reported-by: Bernd Kuhls
> <bernd.kuhls@t-online.de> Signed-off-by:
> "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Bernd
> Kuhls <bernd.kuhls@t-online.de> 

Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>

[Buildroot] [PATCH] package/nvidia-driver: don't install gl.pc when not providing libgl

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Fri, 24 Apr 2015 23:39:57 +0200, Yann E. MORIN wrote:
> When nvidia-driver does not provide libgl (i.e. when it does not install
> the X.org driver), it should also not install gl.pc, otherwise, packages
> that depend on pkg-config will mis-detect presence of GL and fail to
> build, like vlc:
> 
>     http://autobuild.buildroot.org/results/724/724fce8ce51c2c0578192b1369a1cfcea3d72638/
> 
> So, only install gl.pc when we install the X.org driver. Similarly, we
> do not need to install libGL.la either.
> 
> Reported-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/nvidia-driver/nvidia-driver.mk | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com