CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Thu Feb  7 10:07:21 UTC 2019

Modified Files:
        pkgsrc/lang/ruby24-base: hacks.mk
        pkgsrc/lang/ruby25-base: hacks.mk
        pkgsrc/lang/ruby26-base: hacks.mk

Log Message:
apply the gcc6.5 and arm64 hack to gcc [67].*.  fixes arm64 builds on gcc7.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby24-base/hacks.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby25-base/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby26-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/ruby24-base/hacks.mk
diff -u pkgsrc/lang/ruby24-base/hacks.mk:1.2 pkgsrc/lang/ruby24-base/hacks.mk:1.3
--- pkgsrc/lang/ruby24-base/hacks.mk:1.2        Sat Dec 22 03:11:56 2018
+++ pkgsrc/lang/ruby24-base/hacks.mk    Thu Feb  7 10:07:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2018/12/22 03:11:56 roy Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/02/07 10:07:21 mrg Exp $
 
 .if !defined(RUBY24_BASE_HACKS_MK)
 RUBY24_BASE_HACKS_MK=  defined
@@ -36,7 +36,7 @@ BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-fr
 
 # On NetBSD/aarch64, gcc optimisation produces segmentation faulting
 # miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-6.5.*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-[67].*)
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif

Index: pkgsrc/lang/ruby25-base/hacks.mk
diff -u pkgsrc/lang/ruby25-base/hacks.mk:1.2 pkgsrc/lang/ruby25-base/hacks.mk:1.3
--- pkgsrc/lang/ruby25-base/hacks.mk:1.2        Sat Dec 22 03:53:24 2018
+++ pkgsrc/lang/ruby25-base/hacks.mk    Thu Feb  7 10:07:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2018/12/22 03:53:24 roy Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/02/07 10:07:21 mrg Exp $
 
 .if !defined(RUBY24_BASE_HACKS_MK)
 RUBY24_BASE_HACKS_MK=  defined
@@ -36,7 +36,7 @@ BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-fr
 
 # On NetBSD/aarch64, gcc optimisation produces segmentation faulting
 # miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-6.5.*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-[67].*)
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif

Index: pkgsrc/lang/ruby26-base/hacks.mk
diff -u pkgsrc/lang/ruby26-base/hacks.mk:1.1 pkgsrc/lang/ruby26-base/hacks.mk:1.2
--- pkgsrc/lang/ruby26-base/hacks.mk:1.1        Sun Feb  3 13:41:33 2019
+++ pkgsrc/lang/ruby26-base/hacks.mk    Thu Feb  7 10:07:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2019/02/03 13:41:33 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2019/02/07 10:07:21 mrg Exp $
 
 .if !defined(RUBY24_BASE_HACKS_MK)
 RUBY24_BASE_HACKS_MK=  defined
@@ -36,7 +36,7 @@ BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-fr
 
 # On NetBSD/aarch64, gcc optimisation produces segmentation faulting
 # miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-6.5.*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) && !empty(CC_VERSION:Mgcc-[67].*)
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif