From fd30bc656ab01bc2cec7bb540ab4564db75a5efa Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 01:01:48 +0900 Subject: [PATCH] Set NOKOGIRI_TEST_GC_LEVEL to major on ppc64le as ruby31 does not seem to support GC.compat on the platform --- rubygem-nokogiri.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index cc7caf3..2260dc8 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,7 +1,7 @@ %global mainver 1.13.1 #%%global prever .rc4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gem_name nokogiri @@ -12,7 +12,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gem_name} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} # MIT: see LICENSE.md # ASL 2.0 @@ -215,13 +215,18 @@ pushd ./%{gem_instdir} # Remove unneeded simplecov coverage test sed -i test/helper.rb \ - -e '\@require.*simplecov@,\@^end$@d' + -e '\@require.*simplecov@,\@^end$@s|^|#|' # Remove minitest-reporters. It does not provide any additional value while # it blows up the dependency chain. sed -i '/require..minitest.reporters./ s/^/#/' test/helper.rb sed -i '/Minitest::Reporters/ s/^/#/' test/helper.rb +# PPC64LE with ruby3.1 does not seem to support GC.compact +%ifarch ppc64le x86_64 +export NOKOGIRI_TEST_GC_LEVEL=major +%endif + # Need investigation. For now anyway build env \ RUBYLIB=".:lib:test:ext" \ @@ -260,6 +265,10 @@ popd %{gem_dir}/doc/%{gem_name}-%{mainver}%{?prever}/ %changelog +* Wed Jan 26 2022 Mamoru TASAKA - 1.13.1-2 +- Set NOKOGIRI_TEST_GC_LEVEL to major on ppc64le as + ruby31 does not seem to support GC.compat on the platform + * Wed Jan 26 2022 Mamoru TASAKA - 1.13.1-1.2 - F-36: rebuild against ruby31