[packages/ruby/dev-2.2] up to 2.2.5 (nfy)
mis
mis at pld-linux.org
Tue Oct 4 15:21:44 CEST 2016
commit 1c3d42372d3f6e9eb34986829b5b161470d17a95
Author: mis <mistoo at gmail.com>
Date: Tue Oct 4 15:21:34 2016 +0200
up to 2.2.5 (nfy)
custom-rubygems-location.patch | 30 ++---
duplicated-paths.patch | 64 ++-------
ruby-ffs.patch | 10 --
ruby-version.patch | 300 +++++++++++++++++++++++++++++++++++++++++
ruby.spec | 83 ++++++------
strip-ccache.patch | 37 +++--
6 files changed, 384 insertions(+), 140 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 6341830..b078080 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -11,25 +11,27 @@
%bcond_with bootstrap # build bootstrap version
%bcond_with tests # build without tests
-%define rel 1
-%define ruby_version 2.1
-%define basever 2.1
-%define patchlevel 10
+%define debug 1
+
+%define rel 0.1
+%define ruby_version 2.2
+%define basever 2.2
+%define patchlevel 5
%define pkg_version %{basever}.%{patchlevel}
%define ruby_suffix %{!?with_default_ruby:%{ruby_version}}
-%define doc_version 2_1_0
+%define doc_version 2_2_2
-%define bigdecimal_ver 1.2.4
+%define bigdecimal_ver 1.2.6
%define io_console_ver 0.4.3
%define irb_ver 0.9.6
%define json_ver 1.8.1
-%define minitest_ver 4.7.5
-%define psych_ver 2.0.5
-%define rake_ver 10.1.0
-%define rdoc_ver 4.1.0
-%define rubygems_ver 2.2.5
-%define test_unit_ver %{pkg_version}.0
+%define minitest_ver 5.4.3
+%define psych_ver 2.0.8
+%define rake_ver 10.4.2
+%define rdoc_ver 4.2.0
+%define rubygems_ver 2.4.5.1
+%define test_unit_ver 3.0.8
%define oname ruby
Summary: Ruby - interpreted scripting language
@@ -45,25 +47,26 @@ Epoch: 1
License: (Ruby or BSD) and Public Domain
Group: Development/Languages
# https://www.ruby-lang.org/en/downloads/
-Source0: https://ftp.ruby-lang.org/pub/ruby/2.1/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5: 2d1eee7fcf152df41ed22665b02f1c3d
+Source0: https://ftp.ruby-lang.org/pub/ruby/2.2/%{oname}-%{pkg_version}.tar.xz
+# Source0-md5: 4b9506c37e908b5b17215b66b2760438
Source1: http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
# Source1-md5: ad1af0043be98ba1a4f6d0185df63876
Source2: http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
-# Source2-md5: bf479c714ba189f9df633600b40aeef5
+# Source2-md5: e20a00c072f7498cd59c349d5ba1496e
Source3: http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5: 3515d672874a1e48d4a8fd32c50639e7
+# Source3-md5: 15ee8617bc4ed21f4186028f114eea86
Source100: ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{oname}-1.8.7-p330.tar.gz
# Source100-md5: 50a49edb787211598d08e756e733e42e
Source4: rdoc.1
Source5: testrb.1
Source6: operating_system.rb
Patch0: %{oname}-lib64.patch
-Patch1: %{oname}-ffs.patch
+#Patch1: %{oname}-ffs.patch
Patch2: fix-bison-invocation.patch
Patch3: mkmf-verbose.patch
Patch4: strip-ccache.patch
-Patch5: duplicated-paths.patch
+Patch5: ruby-version.patch
+Patch6: duplicated-paths.patch
# obsolete?
Patch8: rubygems-2.0.0-binary-extensions.patch
Patch9: custom-rubygems-location.patch
@@ -410,11 +413,12 @@ Biblioteka JSON dla języka Ruby.
%prep
%setup -q -n %{oname}-%{pkg_version} -a1 -a2 -a3 %{?with_bootstrap:-a100}
%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
#%patch8 -p1
%patch9 -p1
%patch12 -p1
@@ -615,16 +619,16 @@ install -d $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
ln -s %{gem_libdir}/json-%{json_ver}/lib/json/ext/parser.so $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
ln -s %{gem_libdir}/json-%{json_ver}/lib/json/ext/generator.so $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
-install -d $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
-%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/minitest $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
+#install -d $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
+#%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/minitest $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
ln -s %{gem_dir}/gems/minitest-%{minitest_ver}/lib/minitest $RPM_BUILD_ROOT%{ruby_libdir}
-%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/minitest-%{minitest_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+#%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/minitest-%{minitest_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
-install -d $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
+#install -d $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
install -d $RPM_BUILD_ROOT%{ruby_libdir}/test
-mv $RPM_BUILD_ROOT%{ruby_libdir}/test/unit $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
+#mv $RPM_BUILD_ROOT%{ruby_libdir}/test/unit $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
ln -s %{gem_dir}/gems/test-unit-%{test_unit_ver}/lib/unit $RPM_BUILD_ROOT%{ruby_libdir}/test
-mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/test-unit-%{test_unit_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+#mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/test-unit-%{test_unit_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
install -d $RPM_BUILD_ROOT%{gem_dir}/gems/psych-%{psych_ver}/lib
install -d $RPM_BUILD_ROOT%{gem_libdir}/psych-%{psych_ver}/lib
@@ -664,7 +668,6 @@ ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%
$RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/bin/rake \
$RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/bin/rdoc \
$RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/bin/ri \
- $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{cal,test,time,uumerge}.rb \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper,rss}/*.rb \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/webrick/*.cgi
@@ -695,7 +698,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc NEWS LEGAL README README.EXT ChangeLog
+%doc NEWS LEGAL README.md README.EXT ChangeLog
%attr(755,root,root) %{_bindir}/ruby%{ruby_suffix}
%attr(755,root,root) %{_libdir}/libruby.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libruby.so.%{ruby_version}
@@ -807,9 +810,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/erb%{ruby_suffix}
%{ruby_libdir}/cgi
-%{ruby_libdir}/date
+#%{ruby_libdir}/date
%{ruby_libdir}/digest
-%{ruby_libdir}/dl
+#%{ruby_libdir}/dl
%{ruby_libdir}/drb
%{ruby_libdir}/fiddle
%{ruby_libdir}/io
@@ -837,13 +840,13 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/benchmark.rb
%{ruby_libdir}/cgi.rb
%{ruby_libdir}/cmath.rb
-%{ruby_libdir}/complex.rb
+#%{ruby_libdir}/complex.rb
%{ruby_libdir}/csv.rb
%{ruby_libdir}/date.rb
%{ruby_libdir}/debug.rb
%{ruby_libdir}/delegate.rb
%{ruby_libdir}/digest.rb
-%{ruby_libdir}/dl.rb
+#%{ruby_libdir}/dl.rb
%{ruby_libdir}/drb.rb
%{ruby_libdir}/e2mmap.rb
%{ruby_libdir}/erb.rb
@@ -853,7 +856,7 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/find.rb
%{ruby_libdir}/forwardable.rb
%{ruby_libdir}/getoptlong.rb
-%{ruby_libdir}/gserver.rb
+#%{ruby_libdir}/gserver.rb
%{ruby_libdir}/ipaddr.rb
%{ruby_libdir}/json.rb
%{ruby_libdir}/kconv.rb
@@ -876,7 +879,7 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/profiler.rb
%{ruby_libdir}/pstore.rb
%{ruby_libdir}/psych.rb
-%{ruby_libdir}/rational.rb
+#%{ruby_libdir}/rational.rb
%{ruby_libdir}/rdoc.rb
%{ruby_libdir}/resolv-replace.rb
%{ruby_libdir}/resolv.rb
@@ -908,7 +911,7 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{ruby_libdir}/rubygems.rb
%exclude %{ruby_libdir}/ubygems.rb
%exclude %{ruby_libdir}/rbconfig/datadir.rb
-%exclude %{ruby_libdir}/rbconfig/obsolete.rb
+#%exclude %{ruby_libdir}/rbconfig/obsolete.rb
%endif
%exclude %{ruby_libdir}/irb.rb
%exclude %{ruby_libdir}/mkmf.rb
@@ -921,7 +924,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{ruby_archdir}/date_core.so
%attr(755,root,root) %{ruby_archdir}/dbm.so
%attr(755,root,root) %{ruby_archdir}/digest.so
-%attr(755,root,root) %{ruby_archdir}/dl.so
+#%attr(755,root,root) %{ruby_archdir}/dl.so
%attr(755,root,root) %{ruby_archdir}/etc.so
%attr(755,root,root) %{ruby_archdir}/fcntl.so
%attr(755,root,root) %{ruby_archdir}/fiber.so
@@ -945,8 +948,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{ruby_archdir}/digest
%attr(755,root,root) %{ruby_archdir}/digest/*.so
-%dir %{ruby_archdir}/dl
-%attr(755,root,root) %{ruby_archdir}/dl/callback.so
+#%dir %{ruby_archdir}/dl
+#%attr(755,root,root) %{ruby_archdir}/dl/callback.so
%dir %{ruby_archdir}/enc
%attr(755,root,root) %{ruby_archdir}/enc/*.so
%dir %{ruby_archdir}/enc/trans
@@ -997,9 +1000,9 @@ rm -rf $RPM_BUILD_ROOT
%{gem_dir}/specifications/test-unit-%{test_unit_ver}.gemspec
%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}
%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
-%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin
-%attr(755,root,root) %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb
-%attr(755,root,root) %{_bindir}/testrb%{ruby_suffix}
+#%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin
+#%attr(755,root,root) %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb
+#%attr(755,root,root) %{_bindir}/testrb%{ruby_suffix}
%{_mandir}/man1/testrb%{ruby_suffix}.1*
%dir %{gem_dir}
diff --git a/custom-rubygems-location.patch b/custom-rubygems-location.patch
index 55c7448..e82f172 100644
--- a/custom-rubygems-location.patch
+++ b/custom-rubygems-location.patch
@@ -5,19 +5,19 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of
Ruby tree.
---
- configure.in | 5 +++++
- loadpath.c | 4 ++++
- template/verconf.h.in | 3 +++
- tool/rbinstall.rb | 9 +++++++++
+ configure.in | 5 +++++
+ loadpath.c | 4 ++++
+ template/verconf.h.tmpl | 3 +++
+ tool/rbinstall.rb | 9 +++++++++
4 files changed, 21 insertions(+)
diff --git a/configure.in b/configure.in
index 03a4152..0e371e2 100644
--- a/configure.in
+++ b/configure.in
-@@ -3804,6 +3804,10 @@ AC_ARG_WITH(vendorarchdir,
+@@ -4264,6 +4264,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
- [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+ [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
+AC_ARG_WITH(rubygemsdir,
+ AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]),
@@ -26,14 +26,14 @@ index 03a4152..0e371e2 100644
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
-@@ -3827,6 +3831,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -4288,6 +4292,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
+AC_SUBST(rubygemsdir)dnl
+ AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
-
diff --git a/loadpath.c b/loadpath.c
index 623dc9d..74c5d9e 100644
--- a/loadpath.c
@@ -49,11 +49,11 @@ index 623dc9d..74c5d9e 100644
RUBY_LIB "\0"
#ifdef RUBY_THINARCH
RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
-diff --git a/template/verconf.h.in b/template/verconf.h.in
+diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
index 79c003e..34f2382 100644
---- a/template/verconf.h.in
-+++ b/template/verconf.h.in
-@@ -34,6 +34,9 @@
+--- a/template/verconf.h.tmpl
++++ b/template/verconf.h.tmpl
+@@ -36,6 +36,9 @@
% if C["RUBY_SEARCH_PATH"]
#define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}"
% end
@@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index b47b6e1..0b99408 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
-@@ -324,6 +324,7 @@ sitelibdir = CONFIG["sitelibdir"]
+@@ -328,6 +328,7 @@ def CONFIG.[](name, mandatory = false)
sitearchlibdir = CONFIG["sitearchdir"]
vendorlibdir = CONFIG["vendorlibdir"]
vendorarchlibdir = CONFIG["vendorarchdir"]
@@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755
mandir = CONFIG["mandir", true]
docdir = CONFIG["docdir", true]
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
-@@ -512,7 +513,15 @@ end
+@@ -506,7 +507,15 @@ def CONFIG.[](name, mandatory = false)
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
noinst = %w[README* *.txt *.rdoc *.gemspec]
@@ -90,7 +90,7 @@ index b47b6e1..0b99408 100755
+ end
end
- install?(:local, :arch, :lib) do
+ install?(:local, :comm, :hdr, :'comm-hdr') do
--
1.8.3.1
diff --git a/duplicated-paths.patch b/duplicated-paths.patch
index 89f5890..eb34107 100644
--- a/duplicated-paths.patch
+++ b/duplicated-paths.patch
@@ -5,71 +5,25 @@ Subject: [PATCH] Prevent duplicated paths when empty version string is
configured.
---
- configure.in | 15 +++++++++------
+ configure.in | 3 ++-
loadpath.c | 12 ++++++++++++
tool/mkconfig.rb | 2 +-
- 3 files changed, 22 insertions(+), 7 deletions(-)
+ 3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure.in b/configure.in
-index 17ed3ed..5843651 100644
+index db37cd6..ce8d149 100644
--- a/configure.in
+++ b/configure.in
-@@ -3718,8 +3718,6 @@ AS_CASE(["$target_os"],
- rubyw_install_name='$(RUBYW_INSTALL_NAME)'
- ])
+@@ -4228,7 +4228,8 @@ AS_CASE(["$ruby_version_dir_name"],
+ ruby_version_dir=/'${ruby_version_dir_name}'
--rubylibdir='${rubylibprefix}/${ruby_version}'
--rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
-
- rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
- AC_ARG_WITH(rubyarchprefix,
-@@ -3749,6 +3747,7 @@ AC_ARG_WITH(ruby-version,
- [ruby_version=full])
- unset RUBY_LIB_VERSION
- unset RUBY_LIB_VERSION_STYLE
-+ruby_version_suffix=/'${ruby_version}'
- AS_CASE(["$ruby_version"],
- [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
- [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
-@@ -3765,30 +3764,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
- ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
- eval $ruby_version
- elif test -z "${ruby_version}"; then
+ if test -z "${ruby_version_dir_name}"; then
- AC_MSG_ERROR([No ruby version, No place for bundled libraries])
-+ unset ruby_version_suffix
++ unset ruby_version_dir
+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
- else
- RUBY_LIB_VERSION="\"${ruby_version}\""
fi
- AC_SUBST(RUBY_LIB_VERSION_STYLE)
- AC_SUBST(RUBY_LIB_VERSION)
-
-+rubylibdir='${rubylibprefix}'${ruby_version_suffix}
-+rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_suffix}}${multiarch-'${rubylibdir}/${arch}'}
-+
- AC_ARG_WITH(sitedir,
- AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
- [sitedir=$withval],
- [sitedir='${rubylibprefix}/site_ruby'])
--sitelibdir='${sitedir}/${ruby_version}'
-+sitelibdir='${sitedir}'${ruby_version_suffix}
-
- AC_ARG_WITH(sitearchdir,
- AS_HELP_STRING([--with-sitearchdir=DIR],
- [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
- [sitearchdir=$withval],
-- [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
-+ [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_suffix}}${multiarch-'${sitelibdir}/${sitearch}'}])
-
- AC_ARG_WITH(vendordir,
- AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
- [vendordir=$withval],
- [vendordir='${rubylibprefix}/vendor_ruby'])
--vendorlibdir='${vendordir}/${ruby_version}'
-+vendorlibdir='${vendordir}'${ruby_version_suffix}
- AC_ARG_WITH(vendorarchdir,
- AS_HELP_STRING([--with-vendorarchdir=DIR],
+ rubylibdir='${rubylibprefix}'${ruby_version_dir}
diff --git a/loadpath.c b/loadpath.c
index 9160031..0d4d953 100644
--- a/loadpath.c
@@ -113,7 +67,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 07076d4..35e6c3c 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
-@@ -121,7 +121,7 @@ File.foreach "config.status" do |line|
+@@ -122,7 +122,7 @@ def config.write(arg)
val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
case name
when /^prefix$/
diff --git a/ruby-ffs.patch b/ruby-ffs.patch
deleted file mode 100644
index fd319e7..0000000
--- a/ruby-ffs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ruby-2.1.6/configure.in~ 2015-03-30 18:35:08.000000000 +0300
-+++ ruby-2.1.6/configure.in 2015-07-30 00:20:25.106114075 +0300
-@@ -1886,6 +1886,7 @@
- AC_CHECK_FUNCS(fchown)
- AC_CHECK_FUNCS(fcntl)
- AC_CHECK_FUNCS(fdatasync)
-+AC_CHECK_FUNCS(ffs)
- AC_CHECK_FUNCS(fmod)
- AC_CHECK_FUNCS(fork)
- AC_CHECK_FUNCS(fsync)
diff --git a/ruby-version.patch b/ruby-version.patch
new file mode 100644
index 0000000..cdd016c
--- /dev/null
+++ b/ruby-version.patch
@@ -0,0 +1,300 @@
+From 4fc1be3af3f58621bb751c9e63c208b15c0e8d16 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 31 Mar 2015 16:21:04 +0200
+Subject: [PATCH 1/4] Use ruby_version_dir_name for versioned directories.
+
+This disallows changing the ruby_version constant by --with-ruby-version
+configuration options. The two places version numbers are disallowed as
+well, since there are a lot of places which cannot handle this format
+properly.
+
+ruby_version_dir_name now specifies custom version string for versioned
+directories, e.g. instead of default X.Y.Z, you can specify whatever
+string.
+---
+ configure.in | 68 ++++++++++++++++++++++++++++-------------------------
+ template/ruby.pc.in | 1 +
+ 2 files changed, 37 insertions(+), 32 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index db37cd6..6e73fae 100644
+--- a/configure.in
++++ b/configure.in
+@@ -4177,9 +4177,6 @@ AS_CASE(["$target_os"],
+ rubyw_install_name='$(RUBYW_INSTALL_NAME)'
+ ])
+
+-rubylibdir='${rubylibprefix}/${ruby_version}'
+-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
+-
+ rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
+ AC_ARG_WITH(rubyarchprefix,
+ AS_HELP_STRING([--with-rubyarchprefix=DIR],
+@@ -4202,58 +4199,64 @@ AC_ARG_WITH(ridir,
+ AC_SUBST(ridir)
+ AC_SUBST(RI_BASE_NAME)
+
+-AC_ARG_WITH(ruby-version,
+- AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
+- [ruby_version=$withval],
+- [ruby_version=full])
+ unset RUBY_LIB_VERSION
+-unset RUBY_LIB_VERSION_STYLE
+-AS_CASE(["$ruby_version"],
+- [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
+- [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
+-if test ${RUBY_LIB_VERSION_STYLE+set}; then
+- {
+- echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+- echo '#define STRINGIZE(x) x'
+- test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+- echo '#include "verconf.h"'
+- echo '#include "version.h"'
+- echo 'ruby_version=RUBY_LIB_VERSION'
+- } > conftest.c
+- test -f verconf.h || > verconf.h
+- ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+- eval $ruby_version
+-elif test -z "${ruby_version}"; then
+- AC_MSG_ERROR([No ruby version, No place for bundled libraries])
+-else
+- RUBY_LIB_VERSION="${ruby_version}"
+-fi
++RUBY_LIB_VERSION_STYLE='3 /* full */'
++{
++echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
++echo '#define STRINGIZE(x) x'
++test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
++echo '#include "verconf.h"'
++echo '#include "version.h"'
++echo 'ruby_version=RUBY_LIB_VERSION'
++} > conftest.c
++test -f verconf.h || > verconf.h
++ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
++eval $ruby_version
++
++RUBY_LIB_VERSION="${ruby_version}"
++
+ AC_SUBST(RUBY_LIB_VERSION_STYLE)
+ AC_SUBST(RUBY_LIB_VERSION)
+
++AC_ARG_WITH(ruby-version,
++ AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|STR)]),
++ [ruby_version_dir_name=$withval],
++ [ruby_version_dir_name=full])
++AS_CASE(["$ruby_version_dir_name"],
++ [full], [ruby_version_dir_name='${ruby_version}'])
++
++ruby_version_dir=/'${ruby_version_dir_name}'
++
++if test -z "${ruby_version_dir_name}"; then
++ AC_MSG_ERROR([No ruby version, No place for bundled libraries])
++fi
++
++rubylibdir='${rubylibprefix}'${ruby_version_dir}
++rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_dir}}${multiarch-'${rubylibdir}/${arch}'}
++
+ AC_ARG_WITH(sitedir,
+ AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
+ [sitedir=$withval],
+ [sitedir='${rubylibprefix}/site_ruby'])
+-sitelibdir='${sitedir}/${ruby_version}'
++sitelibdir='${sitedir}'${ruby_version_dir}
+
+ AC_ARG_WITH(sitearchdir,
+ AS_HELP_STRING([--with-sitearchdir=DIR],
+ [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
+ [sitearchdir=$withval],
+- [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
++ [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_dir}}${multiarch-'${sitelibdir}/${sitearch}'}])
+
+ AC_ARG_WITH(vendordir,
+ AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
+ [vendordir=$withval],
+ [vendordir='${rubylibprefix}/vendor_ruby'])
+-vendorlibdir='${vendordir}/${ruby_version}'
++vendorlibdir='${vendordir}'${ruby_version_dir}
+
+ AC_ARG_WITH(vendorarchdir,
+ AS_HELP_STRING([--with-vendorarchdir=DIR],
+ [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
+ [vendorarchdir=$withval],
+- [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
++ [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
+
+ if test "${LOAD_RELATIVE+set}"; then
+ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
+@@ -4270,6 +4273,7 @@ AC_SUBST(sitearchincludedir)dnl
+ AC_SUBST(arch)dnl
+ AC_SUBST(sitearch)dnl
+ AC_SUBST(ruby_version)dnl
++AC_SUBST(ruby_version_dir_name)dnl
+ AC_SUBST(rubylibdir)dnl
+ AC_SUBST(rubyarchdir)dnl
+ AC_SUBST(sitedir)dnl
+diff --git a/template/ruby.pc.in b/template/ruby.pc.in
+index 8a2c066..c81b211 100644
+--- a/template/ruby.pc.in
++++ b/template/ruby.pc.in
+@@ -9,6 +9,7 @@ MAJOR=@MAJOR@
+ MINOR=@MINOR@
+ TEENY=@TEENY@
+ ruby_version=@ruby_version@
++ruby_version_dir_name=@ruby_version_dir_name@
+ RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
+ RUBY_BASE_NAME=@RUBY_BASE_NAME@
+ RUBY_VERSION_NAME=@RUBY_VERSION_NAME@
+--
+2.1.0
+
+
+From 518850aba6eee76de7715aae8d37330e34b01983 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 31 Mar 2015 16:37:26 +0200
+Subject: [PATCH 2/4] Add ruby_version_dir_name support for RDoc.
+
+---
+ lib/rdoc/ri/paths.rb | 2 +-
+ tool/rbinstall.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
+index 970cb91..5bf8230 100644
+--- a/lib/rdoc/ri/paths.rb
++++ b/lib/rdoc/ri/paths.rb
+@@ -10,7 +10,7 @@ module RDoc::RI::Paths
+ #:stopdoc:
+ require 'rbconfig'
+
+- version = RbConfig::CONFIG['ruby_version']
++ version = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+
+ BASE = if RbConfig::CONFIG.key? 'ridir' then
+ File.join RbConfig::CONFIG['ridir'], version
+diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
+index d4c110e..d39c9a6 100755
+--- a/tool/rbinstall.rb
++++ b/tool/rbinstall.rb
+@@ -406,7 +406,7 @@ def CONFIG.[](name, mandatory = false)
+
+ install?(:doc, :rdoc) do
+ if $rdocdir
+- ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
++ ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version_dir_name'] || CONFIG['ruby_version'], "system")
+ prepare "rdoc", ridatadir
+ install_recursive($rdocdir, ridatadir, :mode => $data_mode)
+ end
+--
+2.1.0
+
+
+From f8d136f9a46d1fe87eba622ab9665935d05e981b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 31 Mar 2015 16:37:44 +0200
+Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
+
+---
+ lib/rubygems/defaults.rb | 11 ++++++-----
+ test/rubygems/test_gem.rb | 5 +++--
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
+index 55ca080..75eea2b 100644
+--- a/lib/rubygems/defaults.rb
++++ b/lib/rubygems/defaults.rb
+@@ -32,20 +32,20 @@ def self.default_dir
+ [
+ File.dirname(RbConfig::CONFIG['sitedir']),
+ 'Gems',
+- RbConfig::CONFIG['ruby_version']
++ RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+ ]
+ elsif RbConfig::CONFIG['rubylibprefix'] then
+ [
+ RbConfig::CONFIG['rubylibprefix'],
+ 'gems',
+- RbConfig::CONFIG['ruby_version']
++ RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+ ]
+ else
+ [
+ RbConfig::CONFIG['libdir'],
+ ruby_engine,
+ 'gems',
+- RbConfig::CONFIG['ruby_version']
++ RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+ ]
+ end
+
+@@ -75,7 +75,8 @@ def self.default_rubygems_dirs
+
+ def self.user_dir
+ parts = [Gem.user_home, '.gem', ruby_engine]
+- parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
++ ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
++ parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
+ File.join parts
+ end
+
+@@ -172,7 +173,7 @@ def self.vendor_dir # :nodoc:
+ return nil unless RbConfig::CONFIG.key? 'vendordir'
+
+ File.join RbConfig::CONFIG['vendordir'], 'gems',
+- RbConfig::CONFIG['ruby_version']
++ RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+ end
+
+ end
+diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
+index 0428bea..b6e090e 100644
+--- a/test/rubygems/test_gem.rb
++++ b/test/rubygems/test_gem.rb
+@@ -963,7 +963,8 @@ def test_self_use_paths
+
+ def test_self_user_dir
+ parts = [@userhome, '.gem', Gem.ruby_engine]
+- parts << RbConfig::CONFIG['ruby_version'] unless RbConfig::CONFIG['ruby_version'].empty?
++ ruby_version_dir_name = RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
++ parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
+
+ assert_equal File.join(parts), Gem.user_dir
+ end
+@@ -1090,7 +1091,7 @@ def test_self_user_home_user_drive_and_path
+ def test_self_vendor_dir
+ expected =
+ File.join RbConfig::CONFIG['vendordir'], 'gems',
+- RbConfig::CONFIG['ruby_version']
++ RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+
+ assert_equal expected, Gem.vendor_dir
+ end
+--
+2.1.0
+
+
+From 88c38a030c22dbf9422ece847bdfbf87d6659313 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Wed, 1 Apr 2015 14:55:37 +0200
+Subject: [PATCH 4/4] Let headers directories follow the configured version
+ name.
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6e73fae..c842725 100644
+--- a/configure.in
++++ b/configure.in
+@@ -275,7 +275,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+ RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
+ AC_SUBST(RUBY_BASE_NAME)
+ AC_SUBST(RUBYW_BASE_NAME)
+-AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
++AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version_dir_name}')
+
+ AC_CANONICAL_TARGET
+ test x"$target_alias" = x &&
+--
+2.1.0
+
diff --git a/strip-ccache.patch b/strip-ccache.patch
index 456a100..b9ee410 100644
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -1,28 +1,25 @@
-strip ccache from CC and CXX from rbconfig.rb
-as a side effect, we need to pass CC to sub-makes
-
---- ruby-2.0.0-p353/tool/mkconfig.rb~ 2013-03-24 17:42:06.000000000 +0200
-+++ ruby-2.0.0-p353/tool/mkconfig.rb 2014-03-18 10:34:08.489251715 +0200
-@@ -77,6 +77,7 @@
- when /^(?:MAJOR|MINOR|TEENY)$/; next
- when /^RUBY_INSTALL_NAME$/; next if $install_name
- when /^RUBY_SO_NAME$/; next if $so_name
+--- ruby-2.2.5/tool/mkconfig.rb.orig 2016-09-19 13:53:05.152982868 +0200
++++ ruby-2.2.5/tool/mkconfig.rb 2016-09-19 14:01:04.182988081 +0200
+@@ -79,6 +79,7 @@
+ when /^LIBRUBY_D?LD/; next
+ when /^RUBY_INSTALL_NAME$/; next vars[name] = (install_name = val).dup if $install_name
+ when /^RUBY_SO_NAME$/; next vars[name] = (so_name = val).dup if $so_name
+ when /^(CC|CXX)$/; val.sub!(/ccache /, '')
when /^arch$/; if val.empty? then val = arch else arch = val end
when /^sitearch$/; val = '$(arch)' if val.empty?
end
---- ruby-2.0.0-p451/common.mk 2014-04-05 16:16:52.983112032 +0300
-+++ ruby-2.0.0-p451/common.mk 2014-04-05 16:26:58.679843426 +0300
-@@ -176,7 +176,7 @@
+--- ruby-2.2.5/common.mk.orig 2016-03-29 23:07:26.000000000 +0200
++++ ruby-2.2.5/common.mk 2016-09-19 14:02:16.189655531 +0200
+@@ -186,7 +186,7 @@
configure-ext: $(EXTS_MK)
build-ext: $(EXTS_MK)
-- $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)"
-+ $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)" CC="$(CC)"
+- $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
++ $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) CC="$(CC)" \
+ ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
- $(MKMAIN_CMD): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
- $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
-@@ -545,7 +545,7 @@
+ prog: program wprogram
+@@ -598,7 +598,7 @@
$(ECHO) making $@
$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
@@ -31,12 +28,12 @@ as a side effect, we need to pass CC to sub-makes
libenc enc: {$(VPATH)}encdb.h
-@@ -860,7 +860,7 @@
+@@ -737,7 +737,7 @@
srcs-enc: $(ENC_MK)
$(ECHO) making srcs under enc
- $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+ $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" CC="$(CC)" $(MFLAGS) srcs
- all-incs: incs
- incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
+ all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
+ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/1c3d42372d3f6e9eb34986829b5b161470d17a95
More information about the pld-cvs-commit
mailing list