[pkgsrc/trunk]: pkgsrc/lang extend the arm64 vs GCC hack to arm64eb, but also...

[mrg <mrg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60b4d426b413
branches:  trunk
changeset: 451273:60b4d426b413
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Sun Apr 25 07:23:09 2021 +0000

description:
extend the arm64 vs GCC hack to arm64eb, but also disable it from GCC 10
onwards -- the problem is no longer present.

diffstat:

 lang/ruby26-base/hacks.mk |  8 ++++----
 lang/ruby27-base/hacks.mk |  8 ++++----
 lang/ruby30-base/hacks.mk |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (66 lines):

diff -r 734a482b57d0 -r 60b4d426b413 lang/ruby26-base/hacks.mk
--- a/lang/ruby26-base/hacks.mk Sun Apr 25 07:21:17 2021 +0000
+++ b/lang/ruby26-base/hacks.mk Sun Apr 25 07:23:09 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2021/02/14 15:31:02 taca Exp $
+# $NetBSD: hacks.mk,v 1.5 2021/04/25 07:23:09 mrg Exp $
 
 .if !defined(RUBY26_BASE_HACKS_MK)
 RUBY26_BASE_HACKS_MK=  defined
@@ -34,9 +34,9 @@
 BUILDLINK_TRANSFORM+=  opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
-# On NetBSD/aarch64, gcc optimisation produces segmentation faulting
-# miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*)
+# On NetBSD/aarch64, GCC before GCC 10 optimisation produces segmentation
+# faulting miniruby binary.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && !empty(CC_VERSION:Mgcc-[2-9]*)
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif
diff -r 734a482b57d0 -r 60b4d426b413 lang/ruby27-base/hacks.mk
--- a/lang/ruby27-base/hacks.mk Sun Apr 25 07:21:17 2021 +0000
+++ b/lang/ruby27-base/hacks.mk Sun Apr 25 07:23:09 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2021/02/14 15:31:23 taca Exp $
+# $NetBSD: hacks.mk,v 1.3 2021/04/25 07:23:10 mrg Exp $
 
 .if !defined(RUBY27_BASE_HACKS_MK)
 RUBY27_BASE_HACKS_MK=  defined
@@ -34,9 +34,9 @@
 BUILDLINK_TRANSFORM+=  opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
-# On NetBSD/aarch64, gcc optimisation produces segmentation faulting
-# miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*)
+# On NetBSD/aarch64, GCC before GCC 10 optimisation produces segmentation
+# faulting miniruby binary.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && !empty(CC_VERSION:Mgcc-[2-9]*)
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif
diff -r 734a482b57d0 -r 60b4d426b413 lang/ruby30-base/hacks.mk
--- a/lang/ruby30-base/hacks.mk Sun Apr 25 07:21:17 2021 +0000
+++ b/lang/ruby30-base/hacks.mk Sun Apr 25 07:23:09 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2021/02/14 14:32:41 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2021/04/25 07:23:10 mrg Exp $
 
 .if !defined(RUBY30_BASE_HACKS_MK)
 RUBY30_BASE_HACKS_MK=  defined
@@ -34,9 +34,9 @@
 BUILDLINK_TRANSFORM+=  opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
-# On NetBSD/aarch64, gcc optimisation produces segmentation faulting
-# miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-*)
+# On NetBSD/aarch64, GCC before GCC 10 optimisation produces segmentation
+# faulting miniruby binary.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && !empty(CC_VERSION:Mgcc-[2-9]*)
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif