kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

install-static-library option [ci skip]

Browse source 
* 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
This commit is contained in:
nobu 2016-10-17 07:17:07 +00:00
parent 64b62f40a5
commit 9bd2490785
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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:

8
configure.in
View file

@ -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

2
tool/rbinstall.rb
View file

@ -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))