64ed17c88c
The iputils build system embeds git tags into the generated binaries for use by commands like ping -V. Since openwrt packaging is done in a different repository from the upstream repo, the tags it finds aren't particularly meaningful, and we get confusing results like those described at https://github.com/openwrt/packages/issues/13920 This change removes the git tag inspection in favor of the static version string that's already known to the upstream build system. Signed-off-by: Noah Meyerhans <frodo@morgul.net>
24 lines
691 B
Diff
24 lines
691 B
Diff
Description: set a static version string rather than discern it from git
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -17,6 +17,7 @@ add_project_arguments(
|
|
|
|
conf = configuration_data()
|
|
conf.set_quoted('PACKAGE_NAME', meson.project_name())
|
|
+conf.set('VCS_TAG', meson.project_version())
|
|
conf.set('_GNU_SOURCE', 1, description : 'Enable GNU extensions on systems that have them.')
|
|
|
|
build_arping = get_option('BUILD_ARPING')
|
|
@@ -207,10 +208,10 @@ foreach h : [
|
|
endif
|
|
endforeach
|
|
|
|
-git_version_h = vcs_tag(
|
|
+git_version_h = configure_file(
|
|
input : 'git-version.h.meson',
|
|
output : 'git-version.h',
|
|
- fallback : meson.project_version()
|
|
+ configuration: conf
|
|
)
|
|
|
|
config_h = configure_file(
|