mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-22 06:01:26 +02:00
fef277c44a
without this patch, sway reports an aports branchname/commitsha in the version output next to the tag version
22 lines
833 B
Diff
22 lines
833 B
Diff
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -161,18 +161,6 @@
|
|
add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')
|
|
|
|
version = '"@0@"'.format(meson.project_version())
|
|
-git = find_program('git', native: true, required: false)
|
|
-if git.found()
|
|
- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
|
|
- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
|
|
- if git_commit.returncode() == 0 and git_branch.returncode() == 0
|
|
- version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
|
|
- meson.project_version(),
|
|
- git_commit.stdout().strip(),
|
|
- git_branch.stdout().strip(),
|
|
- )
|
|
- endif
|
|
-endif
|
|
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
|
|
|
|
# Compute the relative path used by compiler invocations.
|