From 3457daa0fb9cbd6b6acd9e6dce800af60cf1fa62 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 3 Mar 2026 05:31:22 +0100 Subject: [PATCH] platform.mk: Add HOST_DISTRO_INFO HOST_TUPLE is bastardized to contain more info that just the GNU Triplet. Add HOST_DISTRO_INFO to do the caching job, and leave HOST_TUPLE alone. Signed-off-by: Jan Lindemann --- make/make.mk | 4 ++-- make/platform.mk | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/make/make.mk b/make/make.mk index 036963cf..66987214 100644 --- a/make/make.mk +++ b/make/make.mk @@ -11,8 +11,8 @@ include $(JWBDIR)/make/dev-utils.mk CACHED_FILES ?= $(VERSION_FILE) $(wildcard $(TOPDIR)/make/project.conf) CACHED_VARS ?= PROJECT PREREQ VERSION HEX_VERSION FULL_NAME \ WHICH PYTHON ECHO TEST BROWSER SED RM PWD ID CUT TR \ - AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION \ - OS_NAME CAT BIN_INSTALL SUDO \ + AWK GETENT XARGS FIND PRINTF HOST_DISTRO_INFO OS_NAME_VERSION \ + CAT BIN_INSTALL SUDO \ JW_PKG_LD_LIBRARY_PATH JW_PKG_EXE_PATH JW_PKG_PYTHON_PATH include $(JWBDIR)/make/cache.mk diff --git a/make/platform.mk b/make/platform.mk index cb6a4dd6..f0e13e5c 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -71,16 +71,17 @@ endif # -- arch, vendor, os, libc -ifeq ($(HOST_TUPLE),) - HOST_TUPLE := $(shell $(JW_PKG_PY) distro info --format '%{gnu-triplet} %{cascade}') +ifeq ($(HOST_DISTRO_INFO),) + HOST_DISTRO_INFO := $(shell $(JW_PKG_PY) distro info --format '%{gnu-triplet} %{cascade}') endif +HOST_TUPLE ?= $(word 1,$(HOST_DISTRO_INFO)) HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) -HOST_OS_CASCADE := $(wordlist 2,$(words $(HOST_TUPLE)),$(HOST_TUPLE)) +HOST_OS_CASCADE := $(wordlist 2,$(words $(HOST_DISTRO_INFO)),$(HOST_DISTRO_INFO)) PKG_FORMAT ?= $(patsubst pkg-%,%,$(filter pkg-%,$(HOST_OS_CASCADE))) ifndef TARGET