summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2018-11-23 16:37:50 +0000
committerEric Engestrom <eric.engestrom@intel.com>2018-11-26 22:05:02 +0000
commitc0c533767e2a97cb88dcff56f83ae5472e6592cb (patch)
treee8b24c76b77d0afbe74497288f0ff4a88ade3874
parentbd12e025305947066006a6518f5743969aa5664d (diff)
build: stop defining unused VERSION
Scons and autotools don't define it, and as of last commit nothing uses it. `VERSION` is also a generic enough name that something somewhere will eventually clash, and we don't want to repeat the LLVM `DEBUG` fiasco. Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
-rw-r--r--Android.common.mk1
-rw-r--r--meson.build3
2 files changed, 1 insertions, 3 deletions
diff --git a/Android.common.mk b/Android.common.mk
index aa1b266a393..60459d16eba 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -37,7 +37,6 @@ LOCAL_CFLAGS += \
-Wno-missing-field-initializers \
-Wno-initializer-overrides \
-Wno-mismatched-tags \
- -DVERSION=\"$(MESA_VERSION)\" \
-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"
diff --git a/meson.build b/meson.build
index 33f4e5ad3cf..df9043e03fd 100644
--- a/meson.build
+++ b/meson.build
@@ -43,8 +43,7 @@ pre_args = [
'-D__STDC_CONSTANT_MACROS',
'-D__STDC_FORMAT_MACROS',
'-D__STDC_LIMIT_MACROS',
- '-DVERSION="@0@"'.format(meson.project_version()),
- '-DPACKAGE_VERSION=VERSION',
+ '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),
'-DPACKAGE_BUGREPORT="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa"',
]