summaryrefslogtreecommitdiff
path: root/source/d/meson
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-10-20 19:41:13 +0000
committerEric Hameleers <alien@slackware.com>2018-10-21 09:00:29 +0200
commite942aa8f7c69e5fa07c32af30ee0903b464087dc (patch)
tree383f7df3657158f187e1e1c3806f630bc4e5edd8 /source/d/meson
parentfcbdf0b9ccb30d2f290ae4fa408d342e285becde (diff)
downloadcurrent-e942aa8f7c69e5fa07c32af30ee0903b464087dc.tar.gz
Sat Oct 20 19:41:13 UTC 201820181020194113
a/kernel-generic-4.14.78-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.78-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.78-x86_64-1.txz: Upgraded. d/Cython-0.29-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.78-x86-1.txz: Upgraded. d/meson-0.48.1-x86_64-1.txz: Upgraded. k/kernel-source-4.14.78-noarch-1.txz: Upgraded. l/cairo-1.16.0-x86_64-1.txz: Upgraded. l/python-certifi-2018.10.15-x86_64-1.txz: Upgraded. l/python-requests-2.20.0-x86_64-1.txz: Upgraded. l/python-urllib3-1.24-x86_64-1.txz: Upgraded. x/libwacom-0.31-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/meson')
-rwxr-xr-xsource/d/meson/meson.SlackBuild3
-rw-r--r--source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch29
-rw-r--r--source/d/meson/meson.url2
3 files changed, 1 insertions, 33 deletions
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index eaa4b807..38193377 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -53,9 +53,6 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
-# Fix regression in 0.48.0:
-zcat $CWD/meson.dont.exit.1.if.builddir.is.already.configured.patch.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch b/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch
deleted file mode 100644
index 37bbec2c..00000000
--- a/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2f0285c7ef3a3dab71e8d6f4df92ef978470c553 Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Mon, 24 Sep 2018 09:24:38 -0400
-Subject: [PATCH] Return code 0 when builddir is already configured
-
-This is a regression in Meson 0.48.0, commit 674ae46, Meson used to
-exit(0) when running setup command in a builddir already configured.
-Changing to exit(1) breaks some build tools that does "meson builddir
-&& ninja -C builddir".
-
-Closes #4247.
----
- mesonbuild/mesonmain.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
-index cd925e51f2..dfad2e7848 100644
---- a/mesonbuild/mesonmain.py
-+++ b/mesonbuild/mesonmain.py
-@@ -113,7 +113,7 @@ def validate_dirs(self, dir1, dir2, reconfigure):
- '\nIf build failures persist, manually wipe your build directory to clear any\n'
- 'stored system data.\n'
- '\nTo change option values, run "meson configure" instead.')
-- sys.exit(1)
-+ sys.exit(0)
- else:
- if reconfigure:
- print('Directory does not contain a valid build tree:\n{}'.format(build_dir))
-
diff --git a/source/d/meson/meson.url b/source/d/meson/meson.url
index 4f96597b..2103d2ee 100644
--- a/source/d/meson/meson.url
+++ b/source/d/meson/meson.url
@@ -1 +1 @@
-https://github.com/mesonbuild/meson/releases/download/0.48.0/meson-0.48.0.tar.gz
+https://github.com/mesonbuild/meson/releases/download/0.48.1/meson-0.48.1.tar.gz