From 41842502be077aa0ed38f8907984250748e2b0bd Mon Sep 17 00:00:00 2001 From: Bill Sommerfeld Date: Tue, 20 Feb 2024 11:59:18 -0800 Subject: [PATCH] Add GCC_GNU_SHORT_TRIPLET for packages that use ...-solaris2 instead of ...-solaris2.11 Python would like to use this in installed pathnames. Inspired by https://github.com/omniosorg/omnios-build/pull/3492 --- make-rules/ips.mk | 4 +++- make-rules/shared-macros.mk | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/make-rules/ips.mk b/make-rules/ips.mk index 4528c98d99d..3416207c54e 100644 --- a/make-rules/ips.mk +++ b/make-rules/ips.mk @@ -104,6 +104,7 @@ PKG_VARS += MACH MACH32 MACH64 PKG_VARS += BUILD_VERSION OS_VERSION PKG_SOLARIS_VERSION PKG_VARS += GNU_TRIPLET PKG_VARS += GCC_GNU_TRIPLET +PKG_VARS += GCC_GNU_SHORT_TRIPLET PKG_VARS += CONSOLIDATION PKG_VARS += COMPONENT_VERSION IPS_COMPONENT_VERSION HUMAN_VERSION PKG_VARS += COMPONENT_ARCHIVE_URL COMPONENT_PROJECT_URL COMPONENT_NAME @@ -326,7 +327,8 @@ $(GENERATED).p5m: install $(GENERATE_EXTRA_DEPS) $(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(GENERATE_TRANSFORMS) | \ $(GSED) -e '/^$$/d' -e '/^#.*$$/d' \ -e '/\.la$$/d' \ - -e 's/$(subst .,\.,$(GCC_GNU_TRIPLET))/$$(GCC_GNU_TRIPLET)/g' | \ + -e 's/$(subst .,\.,$(GCC_GNU_TRIPLET))/$$(GCC_GNU_TRIPLET)/g' \ + -e 's/$(subst .,\.,$(GCC_GNU_SHORT_TRIPLET))/$$(GCC_GNU_SHORT_TRIPLET)/g' | \ $(PKGFMT) -u | \ uniq | \ $(PKGFMT) | \ diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk index b498c30ec56..61817ae6ed5 100644 --- a/make-rules/shared-macros.mk +++ b/make-rules/shared-macros.mk @@ -650,6 +650,9 @@ FC.gcc.64 = $(GCC_ROOT)/bin/gfortran GCC_FULL_VERSION = $(shell $(GCC_ROOT)/bin/gcc -dumpversion) # Since gcc-9 the GNU triplet is x86_64-pc-solaris2.11 instead of i386-pc-solaris2.11 GCC_GNU_TRIPLET = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine) +GCC_GNU_TRIPLET = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine) +# GCC triplet with shorter version ( ..-solaris2 rather than ..-solaris2.11) +GCC_GNU_SHORT_TRIPLET = $(shell $(GCC_ROOT)/bin/gcc -dumpmachine | /usr/bin/sed -E 's/\.[0-9]+$$//') GCC_BINDIR = $(GCC_ROOT)/bin GCC_LIBDIR.32 = $(GCC_ROOT)/lib GCC_LIBDIR.64 = $(GCC_ROOT)/lib/$(MACH64)