[openwrt/openwrt] apk: move common meson args to its own variable
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 14 03:39:49 PST 2024
jogo pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/954d2ad81b86762a7310a550158f0b35a0f81090
commit 954d2ad81b86762a7310a550158f0b35a0f81090
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Thu Nov 14 12:01:40 2024 +0100
apk: move common meson args to its own variable
Most apk meson args are shared between host and target builds, so lets
have a common variable for them.
Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
---
package/system/apk/Makefile | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
index fec6d5325c..4ce8f21a48 100644
--- a/package/system/apk/Makefile
+++ b/package/system/apk/Makefile
@@ -52,21 +52,20 @@ endef
MESON_HOST_VARS+=VERSION=$(PKG_VERSION)
MESON_VARS+=VERSION=$(PKG_VERSION)
-MESON_HOST_ARGS += \
- -Dlua_version=5.1 \
+MESON_COMMON_ARGS = \
-Dcompressed-help=false \
-Ddocs=disabled \
+ -Dlua_version=5.1 \
-Durl_backend=wget \
- -Dcrypto_backend=openssl \
-Dzstd=false
+MESON_HOST_ARGS += \
+ $(MESON_COMMON_ARGS) \
+ -Dcrypto_backend=openssl
+
MESON_ARGS += \
- -Dlua_version=5.1 \
- -Dcompressed-help=false \
- -Ddocs=disabled \
- -Durl_backend=wget \
- -Dcrypto_backend=$(BUILD_VARIANT) \
- -Dzstd=false
+ $(MESON_COMMON_ARGS) \
+ -Dcrypto_backend=$(BUILD_VARIANT)
HOST_LDFLAGS += \
-Wl,-rpath $(STAGING_DIR_HOST)/lib
More information about the lede-commits
mailing list