[arch-commits] Commit in mesa/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, April 17, 2018 @ 18:49:02
  Author: heftig
Revision: 321931

Use b_ndebug, as documented in docs/meson.html

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0003-meson-Define-NDEBUG-for-non-debug-builds.patch

-----------------------------------------------------+
 0003-meson-Define-NDEBUG-for-non-debug-builds.patch |   34 ------------------
 PKGBUILD                                            |    4 --
 2 files changed, 1 insertion(+), 37 deletions(-)

Deleted: 0003-meson-Define-NDEBUG-for-non-debug-builds.patch
===================================================================
--- 0003-meson-Define-NDEBUG-for-non-debug-builds.patch	2018-04-17 17:38:38 UTC (rev 321930)
+++ 0003-meson-Define-NDEBUG-for-non-debug-builds.patch	2018-04-17 18:49:02 UTC (rev 321931)
@@ -1,34 +0,0 @@
-From 8ea7fb2d833e673a13488a9a5301c906b781fc04 Mon Sep 17 00:00:00 2001
-Message-Id: <8ea7fb2d833e673a13488a9a5301c906b781fc04.1523725229.git.jan.steffens at gmail.com>
-In-Reply-To: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens at gmail.com>
-References: <ac8faf2b14ed1c9ce518eddfc9c5098b6f9c74dd.1523725229.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sat, 14 Apr 2018 18:32:44 +0200
-Subject: [PATCH 3/5] meson: Define NDEBUG for non-debug-builds
-
-This is for parity with autotools. We were suddenly getting assertion
-failures after switching to meson, see [1].
-
-[1]: https://bugs.archlinux.org/task/58218
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index bc1905178d..41a5a0c2ba 100644
---- a/meson.build
-+++ b/meson.build
-@@ -646,6 +646,8 @@ endif
- # Define DEBUG for debug builds only (debugoptimized is not included on this one)
- if get_option('buildtype') == 'debug'
-   pre_args += '-DDEBUG'
-+else
-+  pre_args += '-DNDEBUG'
- endif
- 
- if get_option('shader-cache')
--- 
-2.16.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-17 17:38:38 UTC (rev 321930)
+++ PKGBUILD	2018-04-17 18:49:02 UTC (rev 321931)
@@ -20,7 +20,6 @@
         0001-glvnd-fix-gl-dot-pc.patch
         0001-meson-fix-megadriver-symlinking.patch
         0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
-        0003-meson-Define-NDEBUG-for-non-debug-builds.patch
         0004-meson-Add-library-versions-to-swr-drivers.patch
         0005-meson-Version-libMesaOpenCL-like-autotools-does.patch)
 sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
@@ -30,7 +29,6 @@
             '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
             '9dc2098f98694fb0f3d0b1d3d8c2bed43a8e6379ee73f6638b691a6823baaa28712ffddbae90d06b9295ae0536aa1091a0415ee72207ec3621acfb72f7d22f32'
             '81d374421ba036a45699bc2a84006f5359fe914d25af6c0f23d2a86d1a6a9f61e909faaad11f0191517b4eed7d8dba42fd8c596cffe70b917544d502bf57396b'
-            '4884ff93eb17c4601f1d03f43848c803cbfb87d131e8e21261e22a0f197e6241a1d4b12b97af6a79ca57b010c8425b1c9544acfa1c19f90a447d5d4b3c6dd69e'
             '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
             'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
@@ -47,7 +45,6 @@
   # Upstreamed meson fixes
   patch -Np1 -i ../0001-meson-fix-megadriver-symlinking.patch
   patch -Np1 -i ../0002-meson-Set-.so-version-for-xa-like-autotools-does.patch
-  patch -Np1 -i ../0003-meson-Define-NDEBUG-for-non-debug-builds.patch
   patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
   patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
 
@@ -58,6 +55,7 @@
 build() {
   arch-meson mesa-$pkgver build \
     -D b_lto=false \
+    -D b_ndebug=true \
     -D platforms=x11,wayland,drm,surfaceless \
     -D dri-drivers=i915,i965,r100,r200,nouveau \
     -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr \