diff --git a/ruby-multilib.patch b/ruby-multilib.patch index 1caf23d..5f2f75b 100644 --- a/ruby-multilib.patch +++ b/ruby-multilib.patch @@ -10,25 +10,3 @@ diff -ruN ruby-1.8.3.orig/mkconfig.rb ruby-1.8.3/mkconfig.rb print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " CONFIG = {}\n" -diff -ruN ruby-1.8.3.orig/configure.in ruby-1.8.3/configure.in ---- ruby-1.8.3.orig/configure.in 2005-09-07 08:22:56.000000000 +0900 -+++ ruby-1.8.3/configure.in 2005-09-26 17:46:53.000000000 +0900 -@@ -1424,15 +1424,15 @@ - RUBY_LIB_PREFIX="/lib/ruby" - ;; - *) -- RUBY_LIB_PREFIX="${prefix}/lib/ruby" -+ RUBY_LIB_PREFIX="${libdir}/ruby" - ;; - esac - RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" - - AC_ARG_WITH(sitedir, -- [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]], -+ [ --with-sitedir=DIR site libraries in DIR [LIBDIR/ruby/site_ruby]], - [sitedir=$withval], -- [sitedir='${prefix}/lib/ruby/site_ruby']) -+ [sitedir='${libdir}/ruby/site_ruby']) - SITE_DIR="`eval \"echo ${sitedir}\"`" - case "$target_os" in - cygwin*|mingw*|*djgpp*|os2-emx*) diff --git a/ruby-rubyprefix.patch b/ruby-rubyprefix.patch new file mode 100644 index 0000000..fc54018 --- /dev/null +++ b/ruby-rubyprefix.patch @@ -0,0 +1,96 @@ +diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in +--- ruby-1.8.4.orig/configure.in 2006-04-19 21:54:44.000000000 +0900 ++++ ruby-1.8.4/configure.in 2006-04-19 21:59:48.000000000 +0900 +@@ -1433,6 +1433,13 @@ + rubyw_install_name="$RUBYW_INSTALL_NAME" + ;; + esac ++ ++AC_ARG_WITH(ruby-prefix, ++ AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.]) ++ ,, ++ with_ruby_prefix=no) ++ ++if test "x$with_ruby_prefix" = "x"; then + case "$target_os" in + cygwin*|mingw*|*djgpp*|os2-emx*) + RUBY_LIB_PREFIX="/lib/ruby" +@@ -1441,21 +1448,30 @@ + RUBY_LIB_PREFIX="${prefix}/lib/ruby" + ;; + esac ++else ++ RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby" ++fi + RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" ++RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}" + + AC_ARG_WITH(sitedir, + [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]], + [sitedir=$withval], + [sitedir='${prefix}/lib/ruby/site_ruby']) +-SITE_DIR="`eval \"echo ${sitedir}\"`" ++SITE_DIR="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`" ++_fc_sitedir=${sitedir} ++SITE_DIR2="`eval \"echo ${_fc_sitedir}\"`" ++sitedir="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`" + case "$target_os" in + cygwin*|mingw*|*djgpp*|os2-emx*) + RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" || + RUBY_SITE_LIB_PATH="$SITE_DIR";; + *) +- RUBY_SITE_LIB_PATH="$SITE_DIR";; ++ RUBY_SITE_LIB_PATH="$SITE_DIR"; ++ RUBY_SITE_LIB_PATH2="$SITE_DIR2";; + esac ++RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}" + RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}" + + AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}") + AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") +@@ -1464,6 +1480,7 @@ + AC_SUBST(arch)dnl + AC_SUBST(sitearch)dnl + AC_SUBST(sitedir)dnl ++AC_SUBST(_fc_sitedir)dnl + + configure_args=$ac_configure_args + AC_SUBST(configure_args)dnl +@@ -1472,7 +1489,7 @@ + arch="fat-${target_os}" + + AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB, +- "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}") ++ "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}") + + AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB, + "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}") +@@ -1487,8 +1504,8 @@ + *) sitearch="${arch}" ;; + esac + +-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}") +-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}") ++AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}") ++AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}") + + AC_ARG_WITH(search-path, + [ --with-search-path=DIR specify the additional search path], +diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb +--- ruby-1.8.4.orig/mkconfig.rb 2005-11-11 08:22:03.000000000 +0900 ++++ ruby-1.8.4/mkconfig.rb 2006-04-19 21:55:08.000000000 +0900 +@@ -108,10 +108,10 @@ + print v_fast, v_others + print <> rdoc.files # for ruby-libs cp /dev/null ruby-libs.files -(fgrep '%{_libdir}' ruby-all.files; - fgrep -h '%{_libdir}' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \ +(fgrep '%{_prefix}/lib' ruby-all.files; + fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \ sort | uniq -u > ruby-libs.files # for ruby-mode @@ -343,7 +353,6 @@ arch=`$RPM_BUILD_ROOT%{_bindir}/ruby -r $rbconfig -e 'printf ("%s\n", Config::CO cat <<__EOF__ >> ruby-libs.files %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch %%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest -%%dir %%{sitedir}/%%{rubyxver}/$arch __EOF__ %clean @@ -381,13 +390,17 @@ rm -rf tmp-ruby-docs %doc %{name}-%{version}/ChangeLog %doc %{name}-%{version}/LEGAL %dir %{_libdir}/ruby +%dir %{_prefix}/lib/ruby %dir %{_libdir}/ruby/%{rubyxver} -%dir %{_libdir}/ruby/%{rubyxver}/cgi -%dir %{_libdir}/ruby/%{rubyxver}/net -%dir %{_libdir}/ruby/%{rubyxver}/shell -%dir %{_libdir}/ruby/%{rubyxver}/uri +%dir %{_prefix}/lib/ruby/%{rubyxver} +%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi +%dir %{_prefix}/lib/ruby/%{rubyxver}/net +%dir %{_prefix}/lib/ruby/%{rubyxver}/shell +%dir %{_prefix}/lib/ruby/%{rubyxver}/uri %dir %{sitedir} %dir %{sitedir}/%{rubyxver} +%dir %{sitedir2} +%dir %{sitedir2}/%{rubyxver} %files tcltk -f ruby-tcltk.files %defattr(-, root, root) @@ -401,9 +414,9 @@ rm -rf tmp-ruby-docs %files irb -f irb.files %defattr(-, root, root) %doc tmp-ruby-docs/irb/* -%dir %{_libdir}/ruby/%{rubyxver}/irb -%dir %{_libdir}/ruby/%{rubyxver}/irb/lc -%dir %{_libdir}/ruby/%{rubyxver}/irb/lc/ja +%dir %{_prefix}/lib/ruby/%{rubyxver}/irb +%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc +%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja %files ri -f ri.files %defattr(-, root, root) @@ -420,6 +433,12 @@ rm -rf tmp-ruby-docs %dir %{_datadir}/emacs/site-lisp/ruby-mode %changelog +* Wed Apr 19 2006 Akira TAGOH +- ruby-rubyprefix.patch: moved all arch-independent modules to /usr/lib/ruby + and keep arch-dependent modules in /usr/lib64/ruby for 64bit arch. + so 'rubylibdir', 'sitelibdir' and 'sitedir' on Config::CONFIG points to + /usr/lib/ruby now. (#184199) + * Mon Apr 17 2006 Akira TAGOH - 1.8.4-4 - correct sitelibdir. (#184198)