Quoting Eric Engestrom (2018-01-24 09:41:17) > 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) >
Eric beat me to it :) I'd be okay with a single patch as well, but splitting them would be preferred. Dylan
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
