ruby-changes:45752
From: nobu <ko1@a...>
Date: Fri, 10 Mar 2017 14:34:32 +0900 (JST)
Subject: [ruby-changes:45752] nobu:r57825 (trunk): configure.in: RUBY_SO_NAME as --with-soname
nobu 2017-03-10 14:34:27 +0900 (Fri, 10 Mar 2017) New Revision: 57825 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57825 Log: configure.in: RUBY_SO_NAME as --with-soname * configure.in (RUBY_SO_NAME): [EXPERIMENTAL] use the given name literally if --with-soname is specified. [ruby-core:79972] [Misc #13296] [ci skip] Modified files: trunk/configure.in Index: configure.in =================================================================== --- configure.in (revision 57824) +++ configure.in (revision 57825) @@ -3825,7 +3825,23 @@ sitearchincludedir='${includedir}/${site https://github.com/ruby/ruby/blob/trunk/configure.in#L3825 AC_ARG_WITH(soname, AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]), - [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) + [RUBY_SO_NAME=$withval], + [ + AS_CASE(["$target_os"], + [darwin*], [ + RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)' + ], + [cygwin*], [ + RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' + ], + [mingw*], [ + RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' + AS_IF([test x"${target_cpu}" != xi386], [ + RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" + ]) + ], + [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) + ]) LIBRUBY_LDSHARED=$LDSHARED LIBRUBY_DLDFLAGS=$DLDFLAGS @@ -3925,7 +3941,6 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3941 SOLIBS='-lm -lc' ], [darwin*], [ - RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)' LIBRUBY_LDSHARED='$(CC) -dynamiclib' if test "$load_relative" = yes; then libprefix="@executable_path/../${libdir_basename}" @@ -4157,7 +4172,6 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.in#L4172 fi ], [cygwin*|mingw*], [ - RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0' LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' AS_CASE(["$target_os"], [cygwin*], [ @@ -4167,10 +4181,6 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.in#L4181 fi ], [mingw*], [ - RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}" - if test x"${target_cpu}" != xi386; then - RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" - fi if test x"$enable_shared" = xyes; then LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/