[eruby] - Fix FTBFS (#631180)
Akira TAGOH
tagoh at fedoraproject.org
Tue Sep 14 05:29:09 UTC 2010
commit 496739f94574cf1af251a5a46e8ba6d604bd1f7d
Author: Akira TAGOH <tagoh at redhat.com>
Date: Tue Sep 14 14:29:01 2010 +0900
- Fix FTBFS (#631180)
eruby-fix-build.patch | 12 ++++++++++++
eruby.spec | 11 ++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/eruby-fix-build.patch b/eruby-fix-build.patch
new file mode 100644
index 0000000..26b6177
--- /dev/null
+++ b/eruby-fix-build.patch
@@ -0,0 +1,12 @@
+diff -pruN eruby-1.0.5.orig/configure.rb eruby-1.0.5/configure.rb
+--- eruby-1.0.5.orig/configure.rb 2003-02-10 12:18:10.000000000 +0900
++++ eruby-1.0.5/configure.rb 2010-09-14 14:09:31.000000000 +0900
+@@ -306,7 +306,7 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~
+ $LDFLAGS = "-link -incremental:no -pdb:none"
+ end
+ $LIBS = CONFIG["LIBS"]
+-$XLDFLAGS = CONFIG["XLDFLAGS"]
++$XLDFLAGS = CONFIG["XLDFLAGS"] || ""
+ $XLDFLAGS.gsub!(/-L\./, "")
+ if /mswin32/ !~ RUBY_PLATFORM
+ $XLDFLAGS += " -L$(libdir)"
diff --git a/eruby.spec b/eruby.spec
index a103ab4..1681a82 100644
--- a/eruby.spec
+++ b/eruby.spec
@@ -1,10 +1,10 @@
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
%define ruby_archdir %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')
Name: eruby
Version: 1.0.5
-Release: 13
+Release: 14%{?dist}
# eruby is GPLv2+
# liberuby is LGPLv2+
License: GPLv2+ and LGPLv2+
@@ -14,6 +14,7 @@ BuildRequires: ruby
BuildRequires: ruby-devel >= 1.8.0
Source0: http://www.modruby.net/archive/%{name}-%{version}.tar.gz
+Patch0: eruby-fix-build.patch
Summary: An interpreter of embedded Ruby language
@@ -45,6 +46,7 @@ embedded eRuby.
%prep
%setup -q
+%patch0 -p1 -b .0-build
%build
ruby configure.rb --enable-shared
@@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 14 2010 Akira TAGOH <tagoh at redhat.com> - 1.0.5-14
+- Fix FTBFS (#631180)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list