On Wednesday, 2018-01-24 17:05:52 +0100, Marc Dietrich wrote: > Second hunk of fixes found by manual comparison with autotools generated > compiler flags. > > Signed-off-by: Marc Dietrich <marvi...@gmx.de> > --- > - Why do we need two version macros? > - And why do we either define DEBUG or NDEBUG? > - Also autotools define some PACKAGE_ macros which are never used - maybe > time for a cleanup... > > meson.build | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meson.build b/meson.build > index 9e3b98641f..62205aa250 100644 > --- a/meson.build > +++ b/meson.build > @@ -37,7 +37,7 @@ pre_args = [ > '-D__STDC_FORMAT_MACROS', > '-D__STDC_LIMIT_MACROS', > '-DVERSION="@0@"'.format(meson.project_version()), > - '-DPACKAGE_VERSION=VERSION', > + '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),
Are you sure this is needed? I haven't tested it, but I would think this tells cpp that PACKAGE_VERSION has whatever value VERSION has, which is what we want. > > '-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa";', > ] > > @@ -648,6 +648,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' NAK on this hunk. In meson, asserts and other things depending on NDEBUG are controlled by `-D b_ndebug=true|false`, and shouldn't be overridden inside meson.build The two hunks below are correct though, thank you for finding these :) Could you re-send the patch with these tags? Fixes: 84486f64626ad2b51291b "meson: Enable SSE4.1 optimizations" Fixes: 673dda8330769309a319d "meson: build "radv" vulkan driver for radeon hardware" Cc: Dylan Baker <dylanx.c.ba...@intel.com> Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com> (If you're feeling extra-motivated, you can even split these into two separate patches :P) > endif > > if get_option('shader-cache') > @@ -762,7 +764,7 @@ foreach a : ['-Werror=pointer-arith', '-Werror=vla'] > endforeach > > if host_machine.cpu_family().startswith('x86') > - pre_args += '-DHAVE_SSE41' > + pre_args += '-DUSE_SSE41' > with_sse41 = true > sse41_args = ['-msse4.1'] > > @@ -1015,7 +1017,7 @@ if with_llvm > _llvm_patch = _llvm_patch.split('s')[0] > endif > pre_args += [ > - '-DHAVE_LLVM=0x0@0@@1@@2@'.format(_llvm_version[0], _llvm_version[1], > _llvm_patch), > + '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), > '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch), > ] > elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr > -- > 2.16.0 > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
