packages (RUBY_1_8): ruby/stdout-rouge-fix.patch (NEW) build fix on glibc 2.14

glen glen at pld-linux.org
Tue Oct 18 20:22:33 CEST 2011


Author: glen                         Date: Tue Oct 18 18:22:33 2011 GMT
Module: packages                      Tag: RUBY_1_8
---- Log message:
build fix on glibc 2.14

---- Files affected:
packages/ruby:
   stdout-rouge-fix.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby/stdout-rouge-fix.patch
diff -u /dev/null packages/ruby/stdout-rouge-fix.patch:1.1.2.1
--- /dev/null	Tue Oct 18 20:22:33 2011
+++ packages/ruby/stdout-rouge-fix.patch	Tue Oct 18 20:22:28 2011
@@ -0,0 +1,40 @@
+fix for glibc 2.14 POSIX compat fix
+http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=glibc-2.13-161-gfcabc0f
+
+http://redmine.ruby-lang.org/issues/5108
+
+diff --git a/lib/mkmf.rb b/lib/mkmf.rb
+index c9e738a..7a8004d 100644
+--- a/lib/mkmf.rb
++++ b/lib/mkmf.rb
+@@ -201,20 +201,26 @@ end
+ module Logging
+   @log = nil
+   @logfile = 'mkmf.log'
+-  @orgerr = $stderr.dup
+-  @orgout = $stdout.dup
+   @postpone = 0
+   @quiet = $extmk
+ 
+   def self::open
+     @log ||= File::open(@logfile, 'w')
+     @log.sync = true
++    orgerr = $stderr.dup
++    orgout = $stdout.dup
+     $stderr.reopen(@log)
+     $stdout.reopen(@log)
+     yield
+   ensure
+-    $stderr.reopen(@orgerr)
+-    $stdout.reopen(@orgout)
++    if orgerr
++      $stderr.reopen(orgerr)
++      orgerr.close
++    end
++    if orgout
++      $stdout.reopen(orgout)
++      orgout.close
++    end
+   end
+ 
+   def self::message(*s)
================================================================


More information about the pld-cvs-commit mailing list