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

98 lines
3.4 KiB
Diff
Raw Normal View History

2013-10-07 10:30:18 +00:00
From 94da59aafacc6a9efe829529eb51385588d6f149 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.
---
2019-01-17 07:31:01 +00:00
configure.ac | 5 +++++
loadpath.c | 4 ++++
template/verconf.h.tmpl | 3 +++
tool/rbinstall.rb | 10 ++++++++++
4 files changed, 22 insertions(+)
2012-01-18 14:54:01 +00:00
2018-01-03 11:06:40 +00:00
diff --git a/configure.ac b/configure.ac
index 6bba453e3c..028ef7ca3e 100644
--- a/configure.ac
+++ b/configure.ac
2019-01-17 07:31:01 +00:00
@@ -3745,6 +3745,10 @@ AC_ARG_WITH(vendorarchdir,
2013-02-08 23:54:37 +00:00
[vendorarchdir=$withval],
2016-01-05 09:58:10 +00:00
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${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])
+
2018-01-03 11:06:40 +00:00
AS_IF([test "${LOAD_RELATIVE+set}"], [
2013-10-07 10:30:18 +00:00
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
2019-01-17 07:31:01 +00:00
@@ -3769,6 +3773,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
2016-01-05 09:58:10 +00:00
AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
2013-10-07 10:30:18 +00:00
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
diff --git a/loadpath.c b/loadpath.c
index 623dc9d..74c5d9e 100644
--- a/loadpath.c
+++ b/loadpath.c
2014-01-06 12:48:46 +00:00
@@ -94,6 +94,10 @@ const char ruby_initial_load_paths[] =
2013-12-17 15:56:33 +00:00
#endif
2013-10-07 10:30:18 +00:00
#endif
+#ifdef RUBYGEMS_DIR
+ RUBYGEMS_DIR "\0"
+#endif
+
RUBY_LIB "\0"
#ifdef RUBY_THINARCH
RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
2013-10-07 10:30:18 +00:00
index 79c003e..34f2382 100644
--- a/template/verconf.h.tmpl
+++ b/template/verconf.h.tmpl
2016-01-05 09:58:10 +00:00
@@ -36,6 +36,9 @@
2013-10-07 10:30:18 +00:00
% if C["RUBY_SEARCH_PATH"]
#define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}"
% end
+% if C["rubygemsdir"]
+#define RUBYGEMS_DIR "${rubygemsdir}"
+% end
%
% R = {}
% R["ruby_version"] = '"RUBY_LIB_VERSION"'
2012-01-18 14:54:01 +00:00
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
2013-10-07 10:30:18 +00:00
index b47b6e1..0b99408 100755
2012-01-18 14:54:01 +00:00
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
2019-01-17 07:31:01 +00:00
@@ -334,6 +334,7 @@ def CONFIG.[](name, mandatory = false)
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]
2019-01-17 07:31:01 +00:00
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
@@ -560,7 +561,16 @@ def stub
2012-01-18 14:54:01 +00:00
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
2018-01-03 11:06:40 +00:00
noinst = %w[*.txt *.rdoc *.gemspec]
2019-01-17 07:31:01 +00:00
+ # Bundler carries "rubygems.rb" file, so it must be specialcased :/
+ noinst += %w[rubygems.rb rubygems/ bundler.rb bundler/] if rubygemsdir
2012-01-18 14:54:01 +00:00
install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
+ if rubygemsdir
2019-01-17 07:31:01 +00:00
+ noinst = %w[*.txt *.rdoc *.gemspec]
+ install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :no_install => noinst, :mode => $data_mode)
2012-01-18 14:54:01 +00:00
+ install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode)
2019-01-17 07:31:01 +00:00
+ install_recursive(File.join(srcdir, "lib", "bundler"), File.join(rubylibdir, "bundler"), :no_install => noinst, :mode => $data_mode)
+ install(File.join(srcdir, "lib", "bundler.rb"), rubylibdir, :mode => $data_mode)
2012-01-18 14:54:01 +00:00
+ end
end
install?(:local, :comm, :hdr, :'comm-hdr') do
2013-02-14 16:13:24 +00:00
--
2013-10-07 10:30:18 +00:00
1.8.3.1
2012-01-18 14:54:01 +00:00