build: stop defining unused VERSION

Graphics / Mesa 3D Graphics Library / Mesa - Eric Engestrom [intel.com] - 26 November 2018 22:05 EST

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.

###

diff --git a/Android.common.mk b/Android.common.mk
index aa1b266a39..60459d16eb 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 33f4e5ad3c..df9043e03f 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"',
]

c0c533767e build: stop defining unused VERSION
Android.common.mk | 1 -
meson.build | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)

Upstream: cgit.freedesktop.org


  • Share