fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 03:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/targets: don't leave an empty target directory(ies)

Browse source 
Some drivers do not support certain targets - for example nouveau
doesn't do VAAPI, while freedreno doesn't do of the video backends.

As such if we enter vdpau when building freedreno/ilo/etc, a vdpau/
folder will be created, empty library will be build and almost
immediately removed. Thus keeping an empty vdpau/ folder around.

There are two ways to fix this.

 * add substantial tracking in configure/makefiles so that we never end
up in targets/vdpau
 Downsides:
Error prone, as the configure checks and the 'include
gallium/drivers/foo/Automake.inc' can easily get out of sync.

 * remove the folder, if empty, alongside the empty library.
 Downsides:
In the latter case vdpau/ might be empty before the mesa build has
started, yet we'll remove it either way.

This patch implements the latter option, as the downside isn't that
significant, plus the patch is way shorter ;-)

v2: use has_drivers to track since TARGET_DRIVERS can contain space,
hence neither string comparison nor -n/-z works correctly.

Gentoo Bugzilla: https://bugs.gentoo.org/545230
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov 2017-03-03 19:25:40 +00:00
parent 342e5fdb64
commit 1cd4fde053
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/targets/dri/Makefile.am
View file

@ -139,10 +139,12 @@ endif
# gallium_dri.so in the set of final installed files.
install-data-hook:
for i in $(TARGET_DRIVERS); do \
has_drivers=1; \
ln -f $(DESTDIR)$(dridir)/gallium_dri.so \
$(DESTDIR)$(dridir)/$${i}_dri.so; \
done; \
$(RM) $(DESTDIR)$(dridir)/gallium_dri.*
$(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \
test $${has_drivers} -eq 1 || $(RM) -d $(DESTDIR)$(dridir)
uninstall-hook:
for i in $(TARGET_DRIVERS); do \

4
src/gallium/targets/vdpau/Makefile.am
View file

@ -108,6 +108,7 @@ endif
install-data-hook:
$(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir); \
for i in $(TARGET_DRIVERS); do \
has_drivers=1; \
j=libvdpau_gallium.$(LIB_EXT); \
k=libvdpau_$${i}.$(LIB_EXT); \
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
@ -120,7 +121,8 @@ install-data-hook:
ln -sf $${l} \
$${dest_dir}/$${k}; \
done; \
$(RM) $${dest_dir}/libvdpau_gallium.*
$(RM) $${dest_dir}/libvdpau_gallium.*; \
test $${has_drivers} -eq 1 || $(RM) -d $${dest_dir}
uninstall-hook:
for i in $(TARGET_DRIVERS); do \

4
src/gallium/targets/xvmc/Makefile.am
View file

@ -70,6 +70,7 @@ endif
install-data-hook:
$(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir); \
for i in $(TARGET_DRIVERS); do \
has_drivers=1; \
j=libXvMCgallium.$(LIB_EXT); \
k=libXvMC$${i}.$(LIB_EXT); \
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
@ -82,7 +83,8 @@ install-data-hook:
ln -sf $${l} \
$${dest_dir}/$${k}; \
done; \
$(RM) $${dest_dir}/libXvMCgallium.*
$(RM) $${dest_dir}/libXvMCgallium.*; \
test $${has_drivers} -eq 1 || $(RM) -d $${dest_dir}
uninstall-hook:
for i in $(TARGET_DRIVERS); do \