From a6308e65e662a73902cec09c4f2ab4caa94886af Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 25 Feb 2020 22:02:34 +0200
Subject: [PATCH] mesa: Use own python-mako. python-mako: drop

---
 extra/mesa/build            | 24 ++++++++++++++++++++++++
 extra/mesa/checksums        |  1 +
 extra/mesa/depends          |  1 -
 extra/mesa/sources          |  1 +
 extra/python-mako/build     |  6 ------
 extra/python-mako/checksums |  1 -
 extra/python-mako/depends   |  1 -
 extra/python-mako/sources   |  1 -
 extra/python-mako/version   |  1 -
 9 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 100755 extra/python-mako/build
 delete mode 100644 extra/python-mako/checksums
 delete mode 100644 extra/python-mako/depends
 delete mode 100644 extra/python-mako/sources
 delete mode 100644 extra/python-mako/version

diff --git a/extra/mesa/build b/extra/mesa/build
index 0796da72..af8d2c3e 100755
--- a/extra/mesa/build
+++ b/extra/mesa/build
@@ -1,5 +1,29 @@
 #!/bin/sh -e
 
+# Install python-mako which is solely needed for mesa
+# and thus contained in this build.
+{
+    cd mako
+
+    python3 setup.py build
+    python3 setup.py install \
+        --prefix=/usr \
+        --root="$PWD/dist"
+
+    # Use a glob to avoid having to figure out the Python
+    # version for the path below.
+    cd dist/usr/lib/python*/site-packages
+
+    # Set the PYTHONPATH so python knows where to find mako.
+    # The one liner simply appends the existing path and
+    # handles the case where an unset PYTHONPATH breaks
+    # python as it will only contain our new addition.
+    PYTHONPATH=$PWD:$(python -c "import sys; print(':'.join(sys.path))")
+
+    cd -; cd ..
+}
+
+export PYTHONPATH
 export DESTDIR="$1"
 export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS -fcommon"
 
diff --git a/extra/mesa/checksums b/extra/mesa/checksums
index e31ecca8..813071ba 100644
--- a/extra/mesa/checksums
+++ b/extra/mesa/checksums
@@ -1 +1,2 @@
 1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4  mesa-19.3.4.tar.xz
+2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz
diff --git a/extra/mesa/depends b/extra/mesa/depends
index 1a65438f..07eef570 100644
--- a/extra/mesa/depends
+++ b/extra/mesa/depends
@@ -14,6 +14,5 @@ libxshmfence
 llvm
 meson        make
 python       make
-python-mako  make
 xorgproto
 zlib
diff --git a/extra/mesa/sources b/extra/mesa/sources
index c8363d0b..bc835de5 100644
--- a/extra/mesa/sources
+++ b/extra/mesa/sources
@@ -1 +1,2 @@
 https://mesa.freedesktop.org/archive/mesa-19.3.4.tar.xz
+https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz mako
diff --git a/extra/python-mako/build b/extra/python-mako/build
deleted file mode 100755
index 6efa479b..00000000
--- a/extra/python-mako/build
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-python3 setup.py build
-python3 setup.py install \
-    --prefix=/usr \
-    --root="$1"
diff --git a/extra/python-mako/checksums b/extra/python-mako/checksums
deleted file mode 100644
index 46c37b01..00000000
--- a/extra/python-mako/checksums
+++ /dev/null
@@ -1 +0,0 @@
-2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4  Mako-1.1.1.tar.gz
diff --git a/extra/python-mako/depends b/extra/python-mako/depends
deleted file mode 100644
index fdc793e7..00000000
--- a/extra/python-mako/depends
+++ /dev/null
@@ -1 +0,0 @@
-python
diff --git a/extra/python-mako/sources b/extra/python-mako/sources
deleted file mode 100644
index 36a0328a..00000000
--- a/extra/python-mako/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.1.tar.gz
diff --git a/extra/python-mako/version b/extra/python-mako/version
deleted file mode 100644
index e343e3f8..00000000
--- a/extra/python-mako/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.1 1