git: 11b39f56368e - main - lang/ruby*: switch ruby ports to clang on powerpc with the same workaround that arm uses

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=11b39f56368e20ac102639cd18e0a2eaf5ebb530

commit 11b39f56368e20ac102639cd18e0a2eaf5ebb530
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-09-22 10:13:51 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-09-22 10:13:51 +0000

    lang/ruby*: switch ruby ports to clang on powerpc with the same workaround that arm uses
---
 Mk/bsd.ruby.mk       | 8 ++++----
 lang/ruby27/Makefile | 4 ++--
 lang/ruby30/Makefile | 4 ++--
 lang/ruby31/Makefile | 4 ++--
 lang/ruby32/Makefile | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index c490c994acf5..ca2fe89f7689 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -133,7 +133,7 @@ RUBY?=			${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
 # Ruby 2.7
 #
 RUBY_DISTVERSION=	2.7.6
-RUBY_PORTREVISION=	2
+RUBY_PORTREVISION=	3
 RUBY_PORTEPOCH=		1
 
 .      elif ${RUBY_VER} == 3.0
@@ -141,14 +141,14 @@ RUBY_PORTEPOCH=		1
 # Ruby 3.0
 #
 RUBY_DISTVERSION=	3.0.4
-RUBY_PORTREVISION=	2
+RUBY_PORTREVISION=	3
 RUBY_PORTEPOCH=		1
 .      elif ${RUBY_VER} == 3.1
 #
 # Ruby 3.1
 #
 RUBY_DISTVERSION=	3.1.2
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 
 .      elif ${RUBY_VER} == 3.2
@@ -156,7 +156,7 @@ RUBY_PORTEPOCH=		1
 # Ruby 3.2
 #
 RUBY_DISTVERSION=	3.2.0-preview2
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 
 # When adding a version, please keep the comment in
diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile
index 8cb5f8b9b92d..b640ae0072d7 100644
--- a/lang/ruby27/Makefile
+++ b/lang/ruby27/Makefile
@@ -99,11 +99,11 @@ CONFIGURE_ARGS+=--disable-dtrace
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) || ${ARCH} == powerpc
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif
diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile
index 7154e96ae15d..6a866944c24f 100644
--- a/lang/ruby30/Makefile
+++ b/lang/ruby30/Makefile
@@ -95,11 +95,11 @@ _SUF2=	,${PORTEPOCH}
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) || ${ARCH} == powerpc
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif
diff --git a/lang/ruby31/Makefile b/lang/ruby31/Makefile
index 796437ea91d2..0d1c0a09be91 100644
--- a/lang/ruby31/Makefile
+++ b/lang/ruby31/Makefile
@@ -99,11 +99,11 @@ _SUF2=		,${PORTEPOCH}
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) || ${ARCH} == powerpc
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=	--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=		ac_cv_func__setjmp=yes
 .endif
diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile
index 1f7588c55d46..1f48032e48db 100644
--- a/lang/ruby32/Makefile
+++ b/lang/ruby32/Makefile
@@ -99,11 +99,11 @@ _SUF2=		,${PORTEPOCH}
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) || ${ARCH} == powerpc
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=	--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=		ac_cv_func__setjmp=yes
 .endif