mesa: Use own python-mako. python-mako: drop

kisslinux · Feb 25, 2020 · a6308e6 · a6308e6
1 parent a402a14
commit a6308e6
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/extra/python-mako/checksums b/extra/python-mako/checksums
diff --git a/extra/python-mako/depends b/extra/python-mako/depends
diff --git a/extra/python-mako/sources b/extra/python-mako/sources
diff --git a/extra/python-mako/version b/extra/python-mako/version