[packages/ruby/dev-2.0] Revert "ugly hack to get tk built, but seems File::FNM_CASEFOLD is broken"

glen glen at pld-linux.org
Sun Jun 1 22:09:39 CEST 2014


commit 97c2de537062c7a16fa95fd98ac483cfe78f0fb0
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jun 1 22:56:12 2014 +0300

    Revert "ugly hack to get tk built, but seems File::FNM_CASEFOLD is broken"
    
    This reverts commit 378213fcdb48c8e9e7fd798974ccaa7989471f6b.
    
    the problem was due nonsense in carme filesystem:
    105848590 lrwxrwxrwx 1 root root   12 May 16  2013 /usr/lib64/ñÿ -> libgcj_bc.so*

 ruby.spec | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index fd5f81b..2219f3f 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -11,9 +11,6 @@
 #   will be installed fine on ruby < 2.0, but not usable as path not in include
 #   path, how to force vendor packages built with ruby 2.0 pull ruby 2.0?
 #   for packages with gem deps it's simple: ruby-listen-2.7.1-0.2.noarch marks ruby-modules-2.0.0.451-0.17.x86_64 (cap /usr/share/gems/specifications)
-# - File::FNM_CASEFOLD does not work at all:
-#   $ LC_ALL=C ruby -e 'Dir.glob("/usr/lib64/*tk8.5.*", File::FNM_CASEFOLD).find{|file| puts file}'
-#   -e:1:in `glob': invalid byte sequence in US-ASCII (ArgumentError)
 #
 # Conditional build:
 %bcond_without	doc		# skip (time-consuming) docs generating; intended for speed up test builds
@@ -22,7 +19,7 @@
 %bcond_without	default_ruby	# use this Ruby as default system Ruby
 %bcond_with	bootstrap	# build bootstrap version
 
-%define		rel		0.20
+%define		rel		0.19
 %define		ruby_version	2.0
 %define		basever		2.0.0
 %define		patchlevel	481
@@ -450,10 +447,6 @@ Biblioteka JSON dla języka Ruby.
 # must be regenerated with new bison
 %{__rm} parse.{c,h}
 
-# File::FNM_CASEFOLD gives ArgumentError errors, disabling it seems to make tk configure to succeed
-# http://sprunge.us/CXEO
-%{__sed} -i -e 's/, File::FNM_CASEFOLD//' ext/tk/extconf.rb
-
 # Install custom operating_system.rb.
 install -d lib/rubygems/defaults
 cp -p %{SOURCE6} lib/rubygems/defaults
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/97c2de537062c7a16fa95fd98ac483cfe78f0fb0



More information about the pld-cvs-commit mailing list