|
 |
121925 |
From b5e9dc3683cb085aa57e7b12c35a4f21b2cc1482 Mon Sep 17 00:00:00 2001
|
|
|
121925 |
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
|
121925 |
Date: Fri, 11 Nov 2011 13:14:45 +0100
|
|
|
121925 |
Subject: [PATCH] Allow to install RubyGems into custom location, outside of
|
|
|
121925 |
Ruby tree.
|
|
|
121925 |
|
|
|
121925 |
---
|
|
|
121925 |
configure.in | 8 ++++++++
|
|
|
121925 |
tool/rbinstall.rb | 9 +++++++++
|
|
|
121925 |
version.c | 4 ++++
|
|
|
121925 |
3 files changed, 21 insertions(+)
|
|
|
121925 |
|
|
|
121925 |
diff --git a/configure.in b/configure.in
|
|
|
121925 |
index 1627d12..e064b2b 100644
|
|
|
121925 |
--- a/configure.in
|
|
|
121925 |
+++ b/configure.in
|
|
|
121925 |
@@ -3401,6 +3401,13 @@ AC_ARG_WITH(vendorarchdir,
|
|
|
121925 |
[vendorarchdir=$withval],
|
|
|
121925 |
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
|
|
|
121925 |
|
|
|
121925 |
+AC_ARG_WITH(rubygemsdir,
|
|
|
121925 |
+ AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]),
|
|
|
121925 |
+ [rubygemsdir=$withval])
|
|
|
121925 |
+if test "$rubygemsdir" != ""; then
|
|
|
121925 |
+ AC_DEFINE_UNQUOTED(RUBYGEMS_DIR,"$rubygemsdir" !<verconf>!)
|
|
|
121925 |
+fi
|
|
|
121925 |
+
|
|
|
121925 |
unexpand_shvar rubylibprefix exec_prefix libdir RUBY_BASE_NAME
|
|
|
121925 |
unexpand_shvar rubyarchprefix exec_prefix libdir arch RUBY_BASE_NAME archlibdir rubylibprefix
|
|
|
121925 |
unexpand_shvar rubysitearchprefix exec_prefix libdir sitearch arch RUBY_BASE_NAME archlibdir sitearchlibdir rubylibprefix
|
|
|
121925 |
@@ -3467,6 +3474,7 @@ AC_SUBST(sitearchdir)dnl
|
|
|
121925 |
AC_SUBST(vendordir)dnl
|
|
|
121925 |
AC_SUBST(vendorlibdir)dnl
|
|
|
121925 |
AC_SUBST(vendorarchdir)dnl
|
|
|
121925 |
+AC_SUBST(rubygemsdir)dnl
|
|
|
121925 |
|
|
|
121925 |
configure_args=$ac_configure_args
|
|
|
121925 |
AC_SUBST(configure_args)dnl
|
|
|
121925 |
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
|
|
|
121925 |
index 92e54c6..c72dfb6 100755
|
|
|
121925 |
--- a/tool/rbinstall.rb
|
|
|
121925 |
+++ b/tool/rbinstall.rb
|
|
|
121925 |
@@ -320,6 +320,7 @@ sitelibdir = CONFIG["sitelibdir"]
|
|
|
121925 |
sitearchlibdir = CONFIG["sitearchdir"]
|
|
|
121925 |
vendorlibdir = CONFIG["vendorlibdir"]
|
|
|
121925 |
vendorarchlibdir = CONFIG["vendorarchdir"]
|
|
|
121925 |
+rubygemsdir = CONFIG["rubygemsdir"]
|
|
|
121925 |
mandir = CONFIG["mandir", true]
|
|
|
121925 |
docdir = CONFIG["docdir", true]
|
|
|
121925 |
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
|
|
|
121925 |
@@ -507,7 +508,15 @@ end
|
|
|
121925 |
install?(:local, :comm, :lib) do
|
|
|
121925 |
prepare "library scripts", rubylibdir
|
|
|
121925 |
noinst = %w[README* *.txt *.rdoc *.gemspec]
|
|
|
121925 |
+ noinst += %w[*ubygems.rb rubygems/ datadir.rb] if rubygemsdir
|
|
|
121925 |
install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
|
|
|
121925 |
+ if rubygemsdir
|
|
|
121925 |
+ noinst = %w[obsolete.rb]
|
|
|
121925 |
+ install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode)
|
|
|
121925 |
+ install_recursive(File.join(srcdir, "lib", "rbconfig"), File.join(rubygemsdir, "rbconfig"), :no_install => noinst, :mode => $data_mode)
|
|
|
121925 |
+ install(File.join(srcdir, "lib", "ubygems.rb"), File.join(rubygemsdir, "ubygems.rb"), :mode => $data_mode)
|
|
|
121925 |
+ install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode)
|
|
|
121925 |
+ end
|
|
|
121925 |
end
|
|
|
121925 |
|
|
|
121925 |
install?(:local, :arch, :lib) do
|
|
|
121925 |
diff --git a/version.c b/version.c
|
|
|
121925 |
index 54c4513..d76100b 100644
|
|
|
121925 |
--- a/version.c
|
|
|
121925 |
+++ b/version.c
|
|
|
121925 |
@@ -99,6 +99,10 @@ const char ruby_initial_load_paths[] =
|
|
|
121925 |
#endif
|
|
|
121925 |
#endif
|
|
|
121925 |
|
|
|
121925 |
+#ifdef RUBYGEMS_DIR
|
|
|
121925 |
+ RUBYGEMS_DIR "\0"
|
|
|
121925 |
+#endif
|
|
|
121925 |
+
|
|
|
121925 |
RUBY_LIB "\0"
|
|
|
121925 |
#ifdef RUBY_THINARCH
|
|
|
121925 |
RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
|
121925 |
--
|
|
|
121925 |
1.8.1.2
|
|
|
121925 |
|