[arch-commits] Commit in meson/trunk (PKGBUILD meson-python-3.8.patch)
Antonio Rojas
arojas at archlinux.org
Fri Nov 1 00:34:48 UTC 2019
Date: Friday, November 1, 2019 @ 00:34:47
Author: arojas
Revision: 366308
Fix boost test with python 3.8
Added:
meson/trunk/meson-python-3.8.patch
Modified:
meson/trunk/PKGBUILD
------------------------+
PKGBUILD | 3 +++
meson-python-3.8.patch | 13 +++++++++++++
2 files changed, 16 insertions(+)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-31 22:14:10 UTC (rev 366307)
+++ PKGBUILD 2019-11-01 00:34:47 UTC (rev 366308)
@@ -18,10 +18,12 @@
'libelf' 'python-pytest-xdist')
source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc}
skip-test.diff
+ meson-python-3.8.patch
arch-meson)
sha512sums=('9efe962c60e21bf4159ce0b113caba0119751a5f6217cd116f6e43b0b4150af0eb7ab484a74d8e9438d78a5d0458dda4215e9b6b9c96bfc0d07e23d709d2929f'
'SKIP'
'fd1694e74cfa628bda81b1056061d75fa288e04d72bda733f3667be43cfb21c60f2e89455e4a101a7f6bef5754fe112dc84e18ec7a0807bc791015c34deea347'
+ '343d49889942d1cd3f5dc0c573dba226ca9a6c6c5845ff4e74d3c672532ba6fb7cbfeaadb6e053e8793cd7cbfbc936fb753c2dcd95dd236476f07129ac07f67c'
'f451f8a7ef9cf1dd724c2ce20bb85a3f1611b87b2e7a17ef0fdbe8ab82a67389f818ea30a5adfe8413143e4eac77ea2e0b8234b5b2466b41a892e2bd0435376c')
validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <jpakkane at gmail.com>
@@ -30,6 +32,7 @@
# Our containers do not allow sanitizers to run
patch -Np1 -i ../skip-test.diff
+ patch -p1 -i ../meson-python-3.8.patch # Fix boost test with python 3.8
}
build() {
Added: meson-python-3.8.patch
===================================================================
--- meson-python-3.8.patch (rev 0)
+++ meson-python-3.8.patch 2019-11-01 00:34:47 UTC (rev 366308)
@@ -0,0 +1,13 @@
+diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
+index 8f45dc7f..44bc376d 100644
+--- a/test cases/frameworks/1 boost/meson.build
++++ b/test cases/frameworks/1 boost/meson.build
+@@ -30,7 +30,7 @@ pymod = import('python')
+ python2 = pymod.find_installation('python2', required: host_machine.system() == 'linux', disabler: true)
+ python3 = pymod.find_installation('python3', required: host_machine.system() == 'linux', disabler: true)
+ python2dep = python2.dependency(required: host_machine.system() == 'linux', disabler: true)
+-python3dep = python3.dependency(required: host_machine.system() == 'linux', disabler: true)
++python3dep = dependency('python3-embed', required: host_machine.system() == 'linux', disabler: true)
+
+ # compile python 2/3 modules only if we found a corresponding python version
+ if(python2dep.found() and host_machine.system() == 'linux')
More information about the arch-commits
mailing list