From nobody Thu Sep 22 11:26:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MYCfZ59j9z4d76P; Thu, 22 Sep 2022 11:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MYCfZ4MJzz3wdT; Thu, 22 Sep 2022 11:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663846006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzrWcyYZ+o2wRzwpyZJn33CleXM36I3Vs/31vP2Z+2Y=; b=MFNlunQPia2hOKkxzxo6QnbOBh4sPUHYj3kmEpd4wMQ4FyBOAFzvv6ojDKOwP3zr9eu3Xh jTZat2OE2CeVv0C4Q06/MH5YswzH42VcKObppjDhQyuDG4VFSU5w92bu/E++wMyCwCjl1C zdAtEIgIy9tr/9W8rG1wD2r9omAeRRq3WBGDltxEsWCCEr7M7nI13bczO3c37X3HQUsZJq jkTuZEIxn0Dv54VAA0Tl2MWWkBLzI1iWjh0i7SqW4vlvqtI70I6xSoNrzZLPi28AXtDqMR BIHch4BcPGUBv3CHzECaCI4dbGR0w2i6ENGr/4N+0OYZj81+zJeDT3826SFGbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MYCfZ3RYxzP8C; Thu, 22 Sep 2022 11:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28MBQkRt089599; Thu, 22 Sep 2022 11:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28MBQksU089598; Thu, 22 Sep 2022 11:26:46 GMT (envelope-from git) Date: Thu, 22 Sep 2022 11:26:46 GMT Message-Id: <202209221126.28MBQksU089598@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 11b39f56368e - main - lang/ruby*: switch ruby ports to clang on powerpc with the same workaround that arm uses List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11b39f56368e20ac102639cd18e0a2eaf5ebb530 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663846006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzrWcyYZ+o2wRzwpyZJn33CleXM36I3Vs/31vP2Z+2Y=; b=tB5+h+dAkaXnaVj1QKyBobz0zt6L2wIu9csGLs5w3rHHCux4u1oQioAfXXxcbeQlhJBJGV bUkoA/oufIbwswQgSt3MDJAi4aNDoj5aFdZpoKBfPNgAg+0G1UJL6I42vE0Gw9vYjE/gwp 7CprDpp56xxGcyQNMn4yjqrGIUP6qJPphCi7n29sm3wu8a6gweJLo4WfY2enYP64PauByQ 0nNKbQUWDgH13VGUNN39+YosIa0om6VWFVIKxVA/K2h38wpeBIMitqB1Xm3mKqD+vbpFtN yThPApxt5edxk0KU8gF5d8VSaBUqx0/Ic55mC7WTvwboa2525PQLV8ndL+Laog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663846006; a=rsa-sha256; cv=none; b=Yoz3hPKNw5KhAo8jD4EskPMPxoZpUuJVOs8ku+t2430mtCcuUSSIpVcTduFPazxCQWZz9o QC19wduu6Y5Fwf3SP/PG3bRek++dffOBEXAy39DGL8TMTRZNu6t4Df5zciTwZ8mNh/naCQ 7xrv2EI87D3lM3d9AwfWtNT+/N/8JqL2vegA6CLRkUQVwzAo4ERp10NE7lA6Qs2DRe6vJ7 mJV3+rrutDF+UsxpCE/lCtUC+CtSnj6xQPxbNPRaH4xEcYjhwEzMJP/35kMRkqS0t4Qi8v D0eSzI4+j8WJlQVoMARCwmuBDH+1YC+gM1jpLEONSmQitp67/LshzGf+AnOXWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=11b39f56368e20ac102639cd18e0a2eaf5ebb530 commit 11b39f56368e20ac102639cd18e0a2eaf5ebb530 Author: Piotr Kubaj AuthorDate: 2022-09-22 10:13:51 +0000 Commit: Piotr Kubaj 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