ruby/ruby-1.9.3-custom-rubygems-location.patch

85 lines
2.9 KiB
Diff
Raw Normal View History

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