package/nvidia-driver: don't install gl.pc when not providing libgl
PATCH 1/1 package/nvidia-driver: don't install gl.pc when not providing libgl
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.
--- package/nvidia-driver/nvidia-driver.mk | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
package/nvidia-driver/nvidia-driver.mk +10 -5
@@ -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
Signature · 1 line
1.9.1
PATCH 1/1 package/nvidia-driver: don't install gl.pc when not providing libgl
"Yann E. MORIN" <[email protected]> wrote in news:1429911597-19411-1-git-send-email-yann.morin.1998 at free.fr:
Quoted 8 lines
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/
Quoted 7 lines
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 <[email protected]> Signed-off-by:
"Yann E. MORIN" <[email protected]> Cc: Bernd Kuhls <[email protected]>
Thomas Petazzoni
AppliedPATCH 1/1 package/nvidia-driver: don't install gl.pc when not providing libgl
In reply to Yann E. MORINDear Yann E. MORIN,
Quoted 10 lines · 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.
Quoted 6 lines
Reported-by Bernd Kuhls <[email protected]>Signed-off-by "Yann E. MORIN" <[email protected]>Cc Bernd Kuhls <[email protected]>--- package/nvidia-driver/nvidia-driver.mk | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com