Mesa (staging/19.0): meson: remove meson-created megadrivers symlinks
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 11 17:04:44 UTC 2019
Module: Mesa
Branch: staging/19.0
Commit: f07ae2f40c39997d788babbe723e021d28b14aa0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f07ae2f40c39997d788babbe723e021d28b14aa0
Author: Eric Engestrom <eric.engestrom at intel.com>
Date: Tue Apr 9 09:28:17 2019 +0100
meson: remove meson-created megadrivers symlinks
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110356
Fixes: aa7afe324c2092fb31f9 "meson: strip rpath from megadrivers"
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Tested-by: Mike Lothian <mike at fireburn.co.uk>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit c77acc3ceba711ec3790fb674aeb8c6a25433741)
---
bin/install_megadrivers.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
index c9ab99a2833..b5ac78887bf 100644
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
@@ -70,7 +70,14 @@ def main():
name, ext = os.path.splitext(name)
finally:
os.chdir(ret)
+
+ # Remove meson-created master .so and symlinks
os.unlink(master)
+ name, ext = os.path.splitext(master)
+ while ext != '.so':
+ if os.path.lexists(name):
+ os.unlink(name)
+ name, ext = os.path.splitext(name)
if __name__ == '__main__':
More information about the mesa-commit
mailing list