- added ruby-1.8.x_rubylibdir.patch:

allows us to also change the path for the stdlib part of the ruby
  directory tree

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=20
This commit is contained in:
Marcus Rückert 2011-03-18 13:47:34 +00:00 committed by Git OBS Bridge
parent 0fb2400110
commit 3bc831a403
3 changed files with 30 additions and 10 deletions

View File

@ -0,0 +1,18 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -1757,7 +1757,12 @@ case "$target_os" in
rubyw_install_name="$RUBYW_INSTALL_NAME"
;;
esac
-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
+
+AC_ARG_WITH(rubylibdir,
+ [ --with-rubylibdir=DIR stdlib libraries in DIR [[LIBDIR/ruby]]],
+ [rubylibdir=$withval],
+ [rubylibdir='${libdir}/ruby'])
+RUBY_LIB_PREFIX=`eval echo \\"${rubylibdir}\\"`
AC_ARG_WITH(sitedir,
[ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 18 13:46:36 UTC 2011 - mrueckert@suse.de
- added ruby-1.8.x_rubylibdir.patch:
allows us to also change the path for the stdlib part of the ruby
directory tree
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 22 16:38:09 UTC 2011 - mrueckert@suse.de Tue Feb 22 16:38:09 UTC 2011 - mrueckert@suse.de

View File

@ -17,10 +17,9 @@
# norootforbuild # norootforbuild
Name: ruby Name: ruby
Version: 1.8.7.p334 Version: 1.8.7.p334
Release: 1 Release: 0
# #
%define pkg_version 1.8.7 %define pkg_version 1.8.7
%define patch_level p334 %define patch_level p334
@ -72,6 +71,7 @@ Patch12: 1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
Patch13: ruby-1.8.7.p334_remove_zlib_test_params_test.patch Patch13: ruby-1.8.7.p334_remove_zlib_test_params_test.patch
# need to discuss with sec team which encoding is better # need to discuss with sec team which encoding is better
Patch14: ruby-1.8.7.p299_webrick_error_page_encoding.patch Patch14: ruby-1.8.7.p299_webrick_error_page_encoding.patch
Patch15: ruby-1.8.x_rubylibdir.patch
# vendor ruby files taken from: # vendor ruby files taken from:
# http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/ # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
Source3: site-specific.rb Source3: site-specific.rb
@ -84,7 +84,6 @@ Source6: ruby.macros
%endif %endif
# #
Summary: An Interpreted Object-Oriented Scripting Language Summary: An Interpreted Object-Oriented Scripting Language
%description %description
Ruby is an interpreted scripting language for quick and easy Ruby is an interpreted scripting language for quick and easy
object-oriented programming. It has many features for processing text object-oriented programming. It has many features for processing text
@ -129,7 +128,6 @@ Requires: %{name} = %{version}
Requires: ruby_with_bleak_house = %{bleak_house_version} Requires: ruby_with_bleak_house = %{bleak_house_version}
Provides: ruby-devel_with_bleak_house = %{bleak_house_version}-%{release} Provides: ruby-devel_with_bleak_house = %{bleak_house_version}-%{release}
%endif %endif
%description devel %description devel
Development files to link against Ruby. Development files to link against Ruby.
@ -144,7 +142,6 @@ License: GPLv2+
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: TCL/TK bindings for Ruby Summary: TCL/TK bindings for Ruby
Requires: %{name} = %{version} Requires: %{name} = %{version}
%description tk %description tk
TCL/TK bindings for Ruby TCL/TK bindings for Ruby
@ -162,7 +159,6 @@ Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1120 %if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%description doc-ri %description doc-ri
This package contains the RI docs for ruby This package contains the RI docs for ruby
@ -180,7 +176,6 @@ Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1120 %if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%description doc-html %description doc-html
This package contains the HTML docs for ruby This package contains the HTML docs for ruby
@ -195,7 +190,6 @@ License: GPLv2+
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Requires: %{name} = %{version} Requires: %{name} = %{version}
Summary: Example scripts for ruby Summary: Example scripts for ruby
%description examples %description examples
Example scripts for ruby Example scripts for ruby
@ -210,7 +204,6 @@ License: GPLv2+
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Requires: %{name} = %{version} Requires: %{name} = %{version}
Summary: An Interpreted Object-Oriented Scripting Language Summary: An Interpreted Object-Oriented Scripting Language
%description test-suite %description test-suite
Ruby is an interpreted scripting language for quick and easy Ruby is an interpreted scripting language for quick and easy
object-oriented programming. It has many features for processing text object-oriented programming. It has many features for processing text
@ -259,6 +252,7 @@ Authors:
%patch11 %patch11
%patch12 %patch12
%patch13 %patch13
%patch15
%if 0%{?with_bleak_house} %if 0%{?with_bleak_house}
for patch in valgrind configure gc ; do for patch in valgrind configure gc ; do
patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch
@ -268,8 +262,9 @@ find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@"
# make sure it _really_ rebuilds parse.c for us # make sure it _really_ rebuilds parse.c for us
old parse.c old parse.c
%build %build
# autoreconf -fi autoreconf -fi
export CFLAGS="%{optflags} -g -fno-strict-aliasing" export CFLAGS="%{optflags} -g -fno-strict-aliasing"
%configure \ %configure \
--target=%{_target_platform} \ --target=%{_target_platform} \