c670682a97
* Define different expected archives macros for development. When revision was defined, there was also timestamp appended. That does not seem necessary for preview tarballs from upstream. Instead split it into their own separate conditionals. * irb and rdoc are now a bundled gem Don't ship the %ruby_libdir parts and the symlinking for irb and rdoc. The rdoc rubygems plugin should now be correctly present. Remove the additional source. * Multiple gems are now bundled gems. Add them to ruby-bundled-gems subpackage instead of their own separate packages. * Split the rdoc support for ruby version directory from ruby-2.3.0-ruby_version.patch. After Ruby moved RDoc to bundled gems from default gems, the directory in which RDoc is in the upstream tarball is not in the upstream source, necessitating a patch split for the Ruby version patch. It cannot be fully re-created including the rdoc part in a single patch with upstream ruby/ruby github. Instead the part is created from ruby/rdoc github. Add bundled provides for rubygem-json + the source into comments. Source is as described in upstream commits and in the LEGAL file upstream. Add the respective licenses for the subpackage. RDoc includes a new doc generator that is under the MIT license, update the license to reflect it. Resolves: rhbz#2425358
77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
From 6062f4976c5b51f8b952b9f6745175be7b1c5ff9 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
Date: Fri, 8 Feb 2013 22:48:41 +0100
|
|
Subject: [PATCH] Prevent duplicated paths when empty version string is
|
|
configured.
|
|
|
|
---
|
|
configure.ac | 3 ++-
|
|
loadpath.c | 12 ++++++++++++
|
|
tool/mkconfig.rb | 2 +-
|
|
3 files changed, 15 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 2bc5153141..a64358fada 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -4472,7 +4472,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
|
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])
|
|
+ unset ruby_version_dir
|
|
+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
|
|
fi
|
|
|
|
rubylibdir='${rubylibprefix}'${ruby_version_dir}
|
|
diff --git a/loadpath.c b/loadpath.c
|
|
index b8969e6998..bbfd4daa78 100644
|
|
--- a/loadpath.c
|
|
+++ b/loadpath.c
|
|
@@ -65,21 +65,33 @@ const char ruby_initial_load_paths[] =
|
|
RUBY_SEARCH_PATH "\0"
|
|
#endif
|
|
#ifndef NO_RUBY_SITE_LIB
|
|
+#ifdef RUBY_LIB_VERSION_BLANK
|
|
+ RUBY_SITE_LIB "\0"
|
|
+#else
|
|
RUBY_SITE_LIB2 "\0"
|
|
+#endif
|
|
#ifdef RUBY_THINARCH
|
|
RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
#endif
|
|
RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
|
|
+#ifndef RUBY_LIB_VERSION_BLANK
|
|
RUBY_SITE_LIB "\0"
|
|
#endif
|
|
+#endif
|
|
|
|
#ifndef NO_RUBY_VENDOR_LIB
|
|
+#ifdef RUBY_LIB_VERSION_BLANK
|
|
+ RUBY_VENDOR_LIB "\0"
|
|
+#else
|
|
RUBY_VENDOR_LIB2 "\0"
|
|
+#endif
|
|
#ifdef RUBY_THINARCH
|
|
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
#endif
|
|
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
|
|
+#ifndef RUBY_LIB_VERSION_BLANK
|
|
RUBY_VENDOR_LIB "\0"
|
|
+#endif
|
|
#endif
|
|
|
|
RUBY_LIB "\0"
|
|
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
|
|
index db74115730..2b01796abf 100755
|
|
--- a/tool/mkconfig.rb
|
|
+++ b/tool/mkconfig.rb
|
|
@@ -114,7 +114,7 @@
|
|
val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
|
|
case name
|
|
when /^prefix$/
|
|
- val = "(TOPDIR || DESTDIR + #{val})"
|
|
+ val = "(((TOPDIR && TOPDIR.empty?) ? nil : TOPDIR) || DESTDIR + #{val})"
|
|
when /^ARCH_FLAG$/
|
|
val = "arch_flag || #{val}" if universal
|
|
when /^UNIVERSAL_ARCHNAMES$/
|