rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly expand $(prefix) in some Makefiles, e.g. eruby.

Browse Source
This commit is contained in:
Vít Ondruch 2014-04-23 16:36:57 +02:00
parent 3f594feabd
commit f49b015f1f
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
View File

@ -1,16 +1,17 @@
From 763c6571697b0bd551a8a0c27d538d00f161a9f3 Mon Sep 17 00:00:00 2001 From e24d97c938c481450ed80ec83e5399595946c1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com> From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Fri, 8 Feb 2013 22:48:41 +0100 Date: Fri, 8 Feb 2013 22:48:41 +0100
Subject: [PATCH] Prevent duplicated paths when empty version string is Subject: [PATCH] Prevent duplicated paths when empty version string is
configured. configured.
--- ---
configure.in | 15 +++++++++------ configure.in | 15 +++++++++------
loadpath.c | 12 ++++++++++++ loadpath.c | 12 ++++++++++++
2 files changed, 21 insertions(+), 6 deletions(-) tool/mkconfig.rb | 2 +-
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
index 88d24ee..4a300b9 100644 index 17ed3ed..5843651 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -3645,8 +3645,6 @@ AS_CASE(["$target_os"], @@ -3645,8 +3645,6 @@ AS_CASE(["$target_os"],
@ -22,7 +23,7 @@ index 88d24ee..4a300b9 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix, AC_ARG_WITH(rubyarchprefix,
@@ -3676,6 +3676,7 @@ AC_ARG_WITH(ruby-version, @@ -3676,6 +3674,7 @@ AC_ARG_WITH(ruby-version,
[ruby_version=full]) [ruby_version=full])
unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION
unset RUBY_LIB_VERSION_STYLE unset RUBY_LIB_VERSION_STYLE
@ -108,6 +109,19 @@ index 9160031..0d4d953 100644
RUBY_LIB "\0" RUBY_LIB "\0"
#ifdef RUBY_THINARCH #ifdef RUBY_THINARCH
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|
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$/
-- --
1.8.4.2 1.9.0

5
ruby.spec
View File

@ -27,7 +27,7 @@
%endif %endif
%global release 18 %global release 19
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.2.2 %global rubygems_version 2.2.2
@ -884,6 +884,9 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Wed Apr 23 2014 Vít Ondruch <vondruch@redhat.com> - 2.1.1-19
- Correctly expand $(prefix) in some Makefiles, e.g. eruby.
* Tue Apr 08 2014 Vít Ondruch <vondruch@redhat.com> - 2.1.1-18 * Tue Apr 08 2014 Vít Ondruch <vondruch@redhat.com> - 2.1.1-18
- Update to Ruby 2.1.1. - Update to Ruby 2.1.1.
- Revert regression of Hash#reject. - Revert regression of Hash#reject.