diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-17 07:17:07 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-17 07:17:07 +0000 |
| commit | 9bd24907851e390607d0d85365d0f00ed47a2a16 (patch) | |
| tree | 4e674a999c3ee50481d1103804883463f9afc633 | |
| parent | 64b62f40a58408adf7f8fdebdf34ff02a5453d74 (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
3 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Oct 17 16:17:05 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@it.aoyama.ac.jp> * enc/windows_1254.c, test/ruby/enc/test_case_comprehensive.rb: diff --git a/configure.in b/configure.in index fe8ee14f79..87da5d85f8 100644 --- a/configure.in +++ b/configure.in @@ -4047,6 +4047,14 @@ AC_SUBST(CAPITARGET) 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 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 94bf91ecac..a80be8aa38 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -359,7 +359,7 @@ install?(:local, :arch, :lib) do 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)) |