nobu	2016-10-17 16:17:07 +0900 (Mon, 17 Oct 2016)

  New Revision: 56434

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56434

  Log:
    install-static-library option [ci skip]
    
    * configure.in (install-static-library): add option to enable/
      disable to install static ruby library.  defaulted to "no" if
      enable-shared.  [Feature #12845]
    * tool/rbinstall.rb (local-arch-lib): respect the option.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/tool/rbinstall.rb
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 56433)
+++ tool/rbinstall.rb	(revision 56434)
@@ -359,7 +359,7 @@ install?(:local, :arch, :lib) do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L359
   prepare "base libraries", libdir
 
   install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc
-  install arc, libdir, :mode => $data_mode
+  install arc, libdir, :mode => $data_mode unless CONFIG["INSTALL_STATIC_LIBRARY"] == "no"
   if dll == lib and dll != arc
     for link in CONFIG["LIBRUBY_ALIASES"].split
       ln_sf(dll, File.join(libdir, link))
Index: configure.in
===================================================================
--- configure.in	(revision 56433)
+++ configure.in	(revision 56434)
@@ -4047,6 +4047,14 @@ AC_SUBST(CAPITARGET) https://github.com/ruby/ruby/blob/trunk/configure.in#L4047
 AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
 AC_SUBST(INSTALLDOC)
 
+AC_ARG_ENABLE(install-static-library,
+	AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]),
+	[INSTALL_STATIC_LIBRARY=$enableval],
+	AS_IF([test x"$enable_shared" = xyes],
+	    [INSTALL_STATIC_LIBRARY=no],
+	    [INSTALL_STATIC_LIBRARY=yes]))
+AC_SUBST(INSTALL_STATIC_LIBRARY)
+
 if test "$rb_with_pthread" = "yes"; then
     THREAD_MODEL=pthread
 fi
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56433)
+++ ChangeLog	(revision 56434)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Oct 17 16:17:05 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (install-static-library): add option to enable/
+	  disable to install static ruby library.  defaulted to "no" if
+	  enable-shared.  [Feature #12845]
+
+	* tool/rbinstall.rb (local-arch-lib): respect the option.
+
 Sun Oct 16 15:09:06 2016  Martin Duerst  <duerst@i...>
 
 	* enc/windows_1254.c, test/ruby/enc/test_case_comprehensive.rb:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/