Hello community, here is the log from the commit of package ruby2.3 for openSUSE:Factory checked in at 2017-03-31 15:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby2.3 (Old) and /work/SRC/openSUSE:Factory/.ruby2.3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ruby2.3" Fri Mar 31 15:00:44 2017 rev:3 rq:481786 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby2.3/ruby2.3.changes 2017-01-10 10:35:08.613900672 +0100 +++ /work/SRC/openSUSE:Factory/.ruby2.3.new/ruby2.3.changes 2017-03-31 15:00:46.582274721 +0200 @@ -1,0 +2,22 @@ +Tue Mar 21 12:39:15 UTC 2017 - mrueckert@suse.de + +- added patch by rguenther@ to fix building with GCC7: + 0004-RB_GC_GUARD-stronger-than-gcc7.patch + +------------------------------------------------------------------- +Thu Mar 16 15:59:41 UTC 2017 - mrueckert@suse.de + +- switched to git branch based patching. we replace all patches in + this round: + removed: + - 0001-gc.c-tick-for-POWER-arch.patch + - make-gem-build-reproducible.patch + - ruby-1.9.2p290_tcl_no_stupid_rpaths.patch + - ruby2.2.x_rbinstall_gem_buildroot.patch (unused) + - rubygems-1.5.0_buildroot.patch (unused) + added: + - 0001-tcl-no-stupid-rpaths.patch + - 0002-make-gem-build-reproducible.patch + - 0003-gc.c-tick-for-POWER-arch.patch + +------------------------------------------------------------------- Old: ---- 0001-gc.c-tick-for-POWER-arch.patch make-gem-build-reproducible.patch ruby-1.9.2p290_tcl_no_stupid_rpaths.patch ruby2.2.x_rbinstall_gem_buildroot.patch rubygems-1.5.0_buildroot.patch New: ---- 0001-tcl-no-stupid-rpaths.patch 0002-make-gem-build-reproducible.patch 0003-gc.c-tick-for-POWER-arch.patch 0004-RB_GC_GUARD-stronger-than-gcc7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby2.3.spec ++++++ --- /var/tmp/diff_new_pack.4SFQF4/_old 2017-03-31 15:00:47.790103979 +0200 +++ /var/tmp/diff_new_pack.4SFQF4/_new 2017-03-31 15:00:47.794103414 +0200 @@ -114,13 +114,11 @@ Source3: %{name}-default.macros Source99: %{name}-rpmlintrc -# to be regenerated patches? -Source100: rubygems-1.5.0_buildroot.patch -Source101: ruby2.2.x_rbinstall_gem_buildroot.patch - -Patch0: ruby-1.9.2p290_tcl_no_stupid_rpaths.patch -Patch1: make-gem-build-reproducible.patch -Patch2: 0001-gc.c-tick-for-POWER-arch.patch +Patch01: 0001-tcl-no-stupid-rpaths.patch +Patch02: 0002-make-gem-build-reproducible.patch +Patch03: 0003-gc.c-tick-for-POWER-arch.patch +Patch04: 0004-RB_GC_GUARD-stronger-than-gcc7.patch + # Summary: An Interpreted Object-Oriented Scripting Language License: BSD-2-Clause or Ruby @@ -302,9 +300,10 @@ %prep %setup -q -n ruby-%{pkg_version} -%patch0 -%patch1 -p1 -%patch2 -p1 +%patch01 -p1 +%patch02 -p1 +%patch03 -p1 +%patch04 -p1 find sample -type f -print0 | xargs -r0 chmod a-x grep -Erl '^#! */' benchmark bootstraptest ext lib sample test \ | xargs -r perl -p -i -e 's|^#!\s*\S+(\s+.*)?$|#!/usr/bin/ruby%{rb_binary_suffix} $1|' ++++++ 0001-tcl-no-stupid-rpaths.patch ++++++

From 4b3d7a777fee4250e3f51f93476072256626d86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de> Date: Wed, 8 Mar 2017 17:56:36 +0100 Subject: [PATCH 1/4] tcl no stupid rpaths

--- ext/tk/extconf.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index c4ea4067bd..5c35dde04d 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -225,9 +225,7 @@ def get_shlib_path_head else [ - '/opt', '/pkg', '/share', - '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local', - '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr' + '/usr' ].each{|dir| next unless File.directory?(dir) -- 2.12.0 ++++++ 0002-make-gem-build-reproducible.patch ++++++

From 5797bc4db5c6aac2532c19546d6b40b0909ce7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de> Date: Wed, 8 Mar 2017 17:56:58 +0100 Subject: [PATCH 2/4] make gem build reproducible

--- lib/rubygems/package.rb | 4 ++++ lib/rubygems/package/tar_writer.rb | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index 0d9adba26e..ff8c668522 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -109,9 +109,12 @@ class TarInvalidError < Error; end def self.build spec, skip_validation=false gem_file = spec.file_name + spec_file = spec.loaded_from + spec_file = "Gemfile" if spec_file.nil? || spec_file.empty? package = new gem_file package.spec = spec + package.build_time = File.stat(spec_file).mtime.to_i package.build skip_validation gem_file @@ -195,6 +198,7 @@ def add_contents tar # :nodoc: digests = tar.add_file_signed 'data.tar.gz', 0444, @signer do |io| gzip_to io do |gz_io| Gem::Package::TarWriter.new gz_io do |data_tar| + data_tar.mtime = @build_time add_files data_tar end end diff --git a/lib/rubygems/package/tar_writer.rb b/lib/rubygems/package/tar_writer.rb index ab0313c9f8..f73254daaf 100644 --- a/lib/rubygems/package/tar_writer.rb +++ b/lib/rubygems/package/tar_writer.rb @@ -91,12 +91,15 @@ def self.new(io) nil end + attr_accessor :mtime + ## # Creates a new TarWriter that will write to +io+ def initialize(io) @io = io @closed = false + @mtime = Time.now end ## @@ -125,7 +128,7 @@ def add_file(name, mode) # :yields: io header = Gem::Package::TarHeader.new :name => name, :mode => mode, :size => size, :prefix => prefix, - :mtime => Time.now + :mtime => mtime @io.write header @io.pos = final_pos @@ -218,7 +221,7 @@ def add_file_simple(name, mode, size) # :yields: io header = Gem::Package::TarHeader.new(:name => name, :mode => mode, :size => size, :prefix => prefix, - :mtime => Time.now).to_s + :mtime => mtime).to_s @io.write header os = BoundedStream.new @io, size @@ -299,7 +302,7 @@ def mkdir(name, mode) header = Gem::Package::TarHeader.new :name => name, :mode => mode, :typeflag => "5", :size => 0, :prefix => prefix, - :mtime => Time.now + :mtime => mtime @io.write header -- 2.12.0 ++++++ 0001-gc.c-tick-for-POWER-arch.patch -> 0003-gc.c-tick-for-POWER-arch.patch ++++++ --- /work/SRC/openSUSE:Factory/ruby2.3/0001-gc.c-tick-for-POWER-arch.patch 2016-06-06 14:25:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ruby2.3.new/0003-gc.c-tick-for-POWER-arch.patch 2017-03-31 15:00:46.382302990 +0200 @@ -1,26 +1,16 @@ -From a5456a1d8308cec5461846418500f77b69a01e4d Mon Sep 17 00:00:00 2001 -From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> -Date: Thu, 17 Mar 2016 08:14:53 +0000 -Subject: [PATCH] gc.c: tick for POWER arch +From 7e0dd0db948cfd3cca9a38b0f13e3758ad29e05a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de> +Date: Wed, 8 Mar 2017 17:57:11 +0100 +Subject: [PATCH 3/4] gc.c tick for POWER arch -* gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch. - [Fix GH-1291] - -This gives a little performance improvement - - user system total real -Before: 20.870000 0.000000 20.870000 ( 20.893959) -After: 20.720000 0.000000 20.720000 ( 20.733970) - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- - gc.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+) + gc.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) -Index: ruby-2.3.0/gc.c -=================================================================== ---- ruby-2.3.0.orig/gc.c -+++ ruby-2.3.0/gc.c +diff --git a/gc.c b/gc.c +index 8a345db0cc..a612e17359 100644 +--- a/gc.c ++++ b/gc.c @@ -915,6 +915,18 @@ tick(void) return ((unsigned long long)lo)|( ((unsigned long long)hi)<<32); } @@ -40,3 +30,6 @@ #elif defined(_WIN32) && defined(_MSC_VER) #include <intrin.h> typedef unsigned __int64 tick_t; +-- +2.12.0 + ++++++ 0004-RB_GC_GUARD-stronger-than-gcc7.patch ++++++

From c7837b835738dc81f5343f5f655f3553f3fb271a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de> Date: Tue, 21 Mar 2017 13:35:56 +0100 Subject: [PATCH 4/4] RB_GC_GUARD stronger than gcc7

From 9eb54f7fb4672a4b0f39772be819965a4b7088f5 Mon Sep 17 00:00:00 2001 From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Mon, 13 Feb 2017 08:14:19 +0000 Subject: [PATCH] ruby.h: RB_GC_GUARD stronger than gcc7

* include/ruby/ruby.h (RB_GC_GUARD): prevent guarded pointer from optimization by using as an input to inline asm. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 6 +++++- marshal.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) --- include/ruby/ruby.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 60cfb1174e..fec93e1d14 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -555,7 +555,7 @@ static inline int rb_type(VALUE obj); * itself. don't use it directly */ #ifdef __GNUC__ #define RB_GC_GUARD_PTR(ptr) \ - __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;}) + __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); __asm__("### RB_GC_GUARD" : : "m"(rb_gc_guarded_ptr)); rb_gc_guarded_ptr;}) #else #ifdef _MSC_VER #pragma optimize("", off) -- 2.12.0