|
 |
701f202 |
From 643a3d3af2a3847e730c79515bc586768053119a Mon Sep 17 00:00:00 2001
|
|
|
117278a |
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
|
117278a |
Date: Fri, 11 Nov 2011 13:14:45 +0100
|
|
|
117278a |
Subject: [PATCH] Allow to install RubyGems into custom location, outside of
|
|
|
117278a |
Ruby tree.
|
|
|
117278a |
|
|
|
117278a |
---
|
|
|
701f202 |
configure.in | 8 ++++++++
|
|
|
701f202 |
tool/mkconfig.rb | 1 +
|
|
|
701f202 |
tool/rbinstall.rb | 9 +++++++++
|
|
|
701f202 |
version.c | 4 ++++
|
|
|
701f202 |
4 files changed, 22 insertions(+)
|
|
|
117278a |
|
|
|
117278a |
diff --git a/configure.in b/configure.in
|
|
|
701f202 |
index 748edc9..6a16745 100644
|
|
|
117278a |
--- a/configure.in
|
|
|
117278a |
+++ b/configure.in
|
|
|
289d94d |
@@ -3224,6 +3224,13 @@ until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_D
|
|
|
117278a |
dir="${VENDORARCH_DIR}"
|
|
|
117278a |
done
|
|
|
117278a |
|
|
|
117278a |
+AC_ARG_WITH(rubygemsdir,
|
|
|
117278a |
+ AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]),
|
|
|
117278a |
+ [rubygemsdir=$withval])
|
|
|
117278a |
+if test "$rubygemsdir" != ""; then
|
|
|
5c90ae3 |
+ AC_DEFINE_UNQUOTED(RUBYGEMS_DIR,"$rubygemsdir" !<verconf>!)
|
|
|
117278a |
+fi
|
|
|
117278a |
+
|
|
|
117278a |
if test "${LOAD_RELATIVE+set}"; then
|
|
|
117278a |
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
|
|
117278a |
RUBY_EXEC_PREFIX=""
|
|
|
289d94d |
@@ -3317,6 +3324,7 @@ AC_SUBST(sitedir)dnl
|
|
|
117278a |
AC_SUBST(sitearchdir)dnl
|
|
|
117278a |
AC_SUBST(vendordir)dnl
|
|
|
117278a |
AC_SUBST(vendorarchdir)dnl
|
|
|
117278a |
+AC_SUBST(rubygemsdir)dnl
|
|
|
117278a |
|
|
|
117278a |
configure_args=$ac_configure_args
|
|
|
117278a |
AC_SUBST(configure_args)dnl
|
|
|
117278a |
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
|
|
|
701f202 |
index 79b8e44..9cef0c6 100755
|
|
|
117278a |
--- a/tool/mkconfig.rb
|
|
|
117278a |
+++ b/tool/mkconfig.rb
|
|
|
de0a9ae |
@@ -86,6 +86,7 @@ File.foreach "config.status" do |line|
|
|
|
117278a |
when /^sitearchdir$/; sitearchdir_override = val; next
|
|
|
117278a |
when /^vendorarchdir$/; vendorarchdir_override = val; next
|
|
|
117278a |
when /^sitearch/; val = '$(arch)' if val.empty?
|
|
|
117278a |
+ when /^rubygemsdir/; next if val.empty?
|
|
|
117278a |
end
|
|
|
117278a |
case val
|
|
|
117278a |
when /^\$\(ac_\w+\)$/; next
|
|
|
117278a |
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
|
|
|
701f202 |
index 17294a2..2757a73 100755
|
|
|
117278a |
--- a/tool/rbinstall.rb
|
|
|
117278a |
+++ b/tool/rbinstall.rb
|
|
|
51eee22 |
@@ -313,6 +313,7 @@ sitelibdir = CONFIG["sitelibdir"]
|
|
|
117278a |
sitearchlibdir = CONFIG["sitearchdir"]
|
|
|
117278a |
vendorlibdir = CONFIG["vendorlibdir"]
|
|
|
117278a |
vendorarchlibdir = CONFIG["vendorarchdir"]
|
|
|
117278a |
+rubygemsdir = CONFIG["rubygemsdir"]
|
|
|
d122868 |
mandir = CONFIG["mandir", true]
|
|
|
e814bd3 |
docdir = CONFIG["docdir", true]
|
|
|
117278a |
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
|
|
|
51eee22 |
@@ -500,7 +501,15 @@ end
|
|
|
117278a |
install?(:local, :comm, :lib) do
|
|
|
117278a |
prepare "library scripts", rubylibdir
|
|
|
701f202 |
noinst = %w[README* *.txt *.rdoc *.gemspec]
|
|
|
117278a |
+ noinst += %w[*ubygems.rb rubygems/ datadir.rb] if rubygemsdir
|
|
|
117278a |
install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
|
|
|
117278a |
+ if rubygemsdir
|
|
|
117278a |
+ noinst = %w[obsolete.rb]
|
|
|
117278a |
+ install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode)
|
|
|
117278a |
+ install_recursive(File.join(srcdir, "lib", "rbconfig"), File.join(rubygemsdir, "rbconfig"), :no_install => noinst, :mode => $data_mode)
|
|
|
117278a |
+ install(File.join(srcdir, "lib", "ubygems.rb"), File.join(rubygemsdir, "ubygems.rb"), :mode => $data_mode)
|
|
|
117278a |
+ install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode)
|
|
|
117278a |
+ end
|
|
|
117278a |
end
|
|
|
117278a |
|
|
|
117278a |
install?(:local, :arch, :lib) do
|
|
|
117278a |
diff --git a/version.c b/version.c
|
|
|
701f202 |
index 962f39f..979701d 100644
|
|
|
117278a |
--- a/version.c
|
|
|
117278a |
+++ b/version.c
|
|
|
d122868 |
@@ -104,6 +104,10 @@ const char ruby_initial_load_paths[] =
|
|
|
117278a |
#endif
|
|
|
117278a |
#endif
|
|
|
117278a |
|
|
|
117278a |
+#ifdef RUBYGEMS_DIR
|
|
|
117278a |
+ RUBYGEMS_DIR "\0"
|
|
|
117278a |
+#endif
|
|
|
117278a |
+
|
|
|
117278a |
RUBY_LIB "\0"
|
|
|
117278a |
#ifdef RUBY_THIN_ARCHLIB
|
|
|
117278a |
RUBY_THIN_ARCHLIB "\0"
|
|
|
117278a |
--
|
|
|
701f202 |
1.8.0
|
|
|
117278a |
|