lang/gcc: do not include OSREV in host architecture
This eliminates the need for PLIST changes whenever OSREV is incremented.
ok?
M devel/llvm/13/Makefile | 1+ 1-
M devel/llvm/Makefile.inc | 2+ 5-
M lang/gcc/11/Makefile | 2+ 6-
M lang/gcc/8/Makefile | 1+ 5-
M lang/gcc/Makefile.inc | 5+ 1-
5 files changed, 11 insertions(+), 18 deletions(-)
diff 8837c9f71ff031c9d3baa68b22ef1e3a5221ea4a
74ef501df1747bd0fbf687ce145807c799aceff5
commit - 8837c9f71ff031c9d3baa68b22ef1e3a5221ea4a
commit + 74ef501df1747bd0fbf687ce145807c799aceff5
blob - 71687fb3d07a30e28ee98a6b36cdba5af91f0cc3
blob + 0a4ad91d267b2868d1962b918bbf390fc5b35ef0
--- devel/llvm/13/Makefile
+++ devel/llvm/13/Makefile
@@ -2,7 +2,7 @@ LLVM_MAJOR = 13
LLVM_VERSION = ${LLVM_MAJOR}.0.0
LLVM_PKGSPEC = >=13,<14
-REVISION-main = 32
+REVISION-main = 33
REVISION-python = 7
MULTI_PACKAGES = -main -python
blob - d9e79abb90fc87c6c70e1fedcf16f07e35774270
blob + 6353ffafdbc79fb9990e6d6edacae8ccb1c12ca2
--- devel/llvm/Makefile.inc
+++ devel/llvm/Makefile.inc
@@ -136,11 +136,8 @@ MODPY_ADJ_FILES += \
# XXX sync
GCC_VER = 8.4.0
-.if ${MACHINE_ARCH} == "amd64"
-GCC_CONFIG = x86_64-unknown-openbsd${OSREV}
-.else
-GCC_CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
-.endif
+# do not include OSREV
+GCC_CONFIG = ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd
.if ${LLVM_MAJOR} > 13
CLANG_INCLUDE_PATH = ${LLVM_BASE}/lib/clang/${LLVM_MAJOR}/include
blob - 03808d1d4a913d8ef46d51e8f44c6c57d217e29e
blob + b5bd997a76d62cd1c5d60bfd883d6c487f424ccc
--- lang/gcc/11/Makefile
+++ lang/gcc/11/Makefile
@@ -18,8 +18,8 @@ USE_NOEXECONLY = Yes
V = 11.2.0
FULL_VERSION = $V
FULL_PKGVERSION = $V
-REVISION = 14
-REVISION-c++ = 15
+REVISION = 15
+REVISION-c++ = 16
ADASTRAP-amd64 = adastrap-amd64-$V-4.tar.xz
ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
@@ -242,10 +242,6 @@ LIB_DEPENDS += devel/gmp,no_cxx,bootstrap \
devel/libmpc
LIB_DEPENDS-libs =
-.if ${MACHINE_ARCH:Mamd64}
-CONFIG = x86_64-unknown-openbsd${OSREV}
-.endif
-
post-extract:
.for f in egcc eg++
echo "#! /bin/sh" >${WRKDIR}/bin/$f
blob - f438655eb3df6ef988fdb060112c49fdcba7fab0
blob + 4945aaa4c3f1861f57e5ffb91fe61697f508c568
--- lang/gcc/8/Makefile
+++ lang/gcc/8/Makefile
@@ -25,7 +25,7 @@ USE_NOEXECONLY = Yes
V = 8.4.0
FULL_VERSION = $V
FULL_PKGVERSION = $V
-REVISION = 25
+REVISION = 26
ADASTRAP-amd64 = adastrap-amd64-$V-3.tar.xz
ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
@@ -214,10 +214,6 @@ LIB_DEPENDS += devel/gmp,no_cxx,bootstrap \
devel/libmpc
LIB_DEPENDS-libs =
-.if ${MACHINE_ARCH:Mamd64}
-CONFIG = x86_64-unknown-openbsd${OSREV}
-.endif
-
post-extract:
.for f in egcc eg++
echo "#! /bin/sh" >${WRKDIR}/bin/$f
blob - b03c4729bf62338bdd0d07a94659bee561ee62a5
blob + fdeb52fd4a2cac3a2207d04b794c4670825c37d6
--- lang/gcc/Makefile.inc
+++ lang/gcc/Makefile.inc
@@ -40,5 +40,9 @@ DESCR-dlang ?= ${PORTSDIR}/lang/gcc/DESCR-dlang
HOMEPAGE?= https://gcc.gnu.org/
DIST_SUBDIR=gcc
-CONFIG=${MACHINE_ARCH}-unknown-openbsd${OSREV}
+
+# do not include OSREV
+CONFIG=${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd
SUBST_VARS+=CONFIG V
+
+CONFIGURE_ARGS= --build=${CONFIG}
--
Christian "naddy" Weisgerber [email protected]
