From 7372b076ae0d32cb71bff8c611428978c02eb645 Mon Sep 17 00:00:00 2001 From: Doekin Date: Sun, 20 Oct 2024 22:06:13 +0800 Subject: [PATCH] Use built-in `${VERSION_*}` variables --- packages/z/zbar/port/config.h.in | 6 +++--- packages/z/zbar/port/xmake.lua | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/z/zbar/port/config.h.in b/packages/z/zbar/port/config.h.in index aa68a2f0365..f3de305ba17 100644 --- a/packages/z/zbar/port/config.h.in +++ b/packages/z/zbar/port/config.h.in @@ -392,13 +392,13 @@ #undef X_DISPLAY_MISSING /* Program major version (before the '.') as a number */ -#undef ZBAR_VERSION_MAJOR +#define ZBAR_VERSION_MAJOR ${VERSION_MAJOR} /* Program minor version (after '.') as a number */ -#undef ZBAR_VERSION_MINOR +#define ZBAR_VERSION_MINOR ${VERSION_MINOR} /* Program patch version (after the second '.') as a number */ -#undef ZBAR_VERSION_PATCH +#define ZBAR_VERSION_PATCH ${VERSION_ALTER} /* Define to 1 if necessary to make fseeko visible. */ #undef _LARGEFILE_SOURCE diff --git a/packages/z/zbar/port/xmake.lua b/packages/z/zbar/port/xmake.lua index 01fc66544ab..3512fb9285c 100644 --- a/packages/z/zbar/port/xmake.lua +++ b/packages/z/zbar/port/xmake.lua @@ -14,17 +14,8 @@ option_end() if has_config("vers") then set_version(get_config("vers")) - set_configvar("VERSION", get_config("vers")) set_configvar("PACKAGE_VERSION", get_config("vers")) set_configvar("PACKAGE_STRING", "zbar " .. get_config("vers")) - - local vers = get_config("vers"):split("%.") - major_ver = vers[1] or "" - minor_ver = vers[2] or "" - patch_ver = vers[3] or "" - set_configvar("ZBAR_VERSION_MAJOR", major_ver, {quote = false}) - set_configvar("ZBAR_VERSION_MINOR", minor_ver, {quote = false}) - set_configvar("ZBAR_VERSION_PATCH", patch_ver, {quote = false}) end option("LIB_VERSION")