CVS commit: pkgsrc/lang

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Apr 25 07:23:10 UTC 2021

Modified Files:
        pkgsrc/lang/ruby26-base: hacks.mk
        pkgsrc/lang/ruby27-base: hacks.mk
        pkgsrc/lang/ruby30-base: hacks.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby26-base/hacks.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby27-base/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby30-base/hacks.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby26-base/hacks.mk
diff -u pkgsrc/lang/ruby26-base/hacks.mk:1.4 pkgsrc/lang/ruby26-base/hacks.mk:1.5
--- pkgsrc/lang/ruby26-base/hacks.mk:1.4        Sun Feb 14 15:31:02 2021
+++ pkgsrc/lang/ruby26-base/hacks.mk    Sun Apr 25 07:23:09 2021
@@ -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 @@ PKG_HACKS+=           optimisation
 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

Index: pkgsrc/lang/ruby27-base/hacks.mk
diff -u pkgsrc/lang/ruby27-base/hacks.mk:1.2 pkgsrc/lang/ruby27-base/hacks.mk:1.3
--- pkgsrc/lang/ruby27-base/hacks.mk:1.2        Sun Feb 14 15:31:23 2021
+++ pkgsrc/lang/ruby27-base/hacks.mk    Sun Apr 25 07:23:10 2021
@@ -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 @@ PKG_HACKS+=           optimisation
 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

Index: pkgsrc/lang/ruby30-base/hacks.mk
diff -u pkgsrc/lang/ruby30-base/hacks.mk:1.1 pkgsrc/lang/ruby30-base/hacks.mk:1.2
--- pkgsrc/lang/ruby30-base/hacks.mk:1.1        Sun Feb 14 14:32:41 2021
+++ pkgsrc/lang/ruby30-base/hacks.mk    Sun Apr 25 07:23:10 2021
@@ -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 @@ PKG_HACKS+=           optimisation
 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