Mamoru Tasaka wrote:
Jim Meyering wrote, at 06/23/2010 07:31 PM +9:00:
> Mamoru Tasaka wrote:
> ...
>> In some cases ruby modules install ruby script and C extension module
>> in the same name.
>> - e.g. On i686 ruby-gnome2-0.19.4-2.fc14.i686 installs
>> * gnome2.rb under /usr/lib/ruby/site_ruby/1.8/
>> * gnome2.so under /usr/lib/ruby/site_ruby/1.8/i386-linux/
>> In this case, with current 1.8.6.x ruby srpm (and also my 1.8.7.x srpm)
>
> Would you please point me to your latest 1.8.7.x srpm ?
Currently at:
http://koji.fedoraproject.org/scratch/mtasaka/task_2258338/
Thank you.
I have begun reviewing it.
I have adopted the changes that split some of the longer-than-80 lines.
So far I have one suggestion: do not add a duplicate definition:
(you can see the other, existing one at the end, in the context)
From 5416c79435bc17322a39f65997fdedbfdb30e21b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 23 Jun 2010 17:52:57 +0200
Subject: [PATCH] do not add duplicate definition of RUBY_LIB_PATH in patch
ruby-1.8.7-p249-rubyprefix.patch: Remove duplicate definition:
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
---
RHEL-6/ruby-1.8.7-p249-rubyprefix.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/RHEL-6/ruby-1.8.7-p249-rubyprefix.patch
b/RHEL-6/ruby-1.8.7-p249-rubyprefix.patch
index b977b51..faf31e5 100644
--- a/RHEL-6/ruby-1.8.7-p249-rubyprefix.patch
+++ b/RHEL-6/ruby-1.8.7-p249-rubyprefix.patch
@@ -2,45 +2,45 @@
+++ ruby-1.8.7-p249/configure.in 2010-06-17 01:18:18.000000000 +0900
@@ -1706,6 +1706,13 @@
ri_suffix=$program_suffix
RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
+
+AC_ARG_WITH(ruby-prefix,
+ AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.]),
+ [with_ruby_prefix="$withval"],
+ [with_ruby_prefix=""])
+
+if test "x$with_ruby_prefix" = "x"; then
case "$target_os" in
cygwin*|mingw*)
RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
@@ -1713,12 +1720,20 @@
;;
esac
RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
+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 [[LIBDIR/ruby/site_ruby]]],
[sitedir=$withval],
[sitedir='${libdir}/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*)
@@ -1728,9 +1743,11 @@
*)
RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed
's|^NONE/|'"$prefix"'/|'`"
RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed
's|^NONE/|'"$prefix"'/|'`"
+ RUBY_SITE_LIB_PATH2="$SITE_DIR2"
;;
esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
--
1.7.1.664.gf1fb2