1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac: fix SONAME

Browse Source 
* configure.ac (RUBY_SO_NAME): revert $(RUBY_API_VERSION:.=) to
  $(MAJOR)$(MINOR), as a string in middle is not replaced.
  [ruby-core:83208] [Bug #14002]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-10-15 02:31:29 +00:00
parent b1ef4d8096
commit b625191054
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -3789,10 +3789,10 @@ AC_ARG_WITH(soname,
RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)' RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)'
], ],
[cygwin*], [ [cygwin*], [
RUBY_SO_NAME='$(RUBY_BASE_NAME)$(RUBY_API_VERSION:.=)0' RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
], ],
[mingw*], [ [mingw*], [
RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(RUBY_API_VERSION:.=)0' RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
AS_IF([test x"${target_cpu}" != xi386], [ AS_IF([test x"${target_cpu}" != xi386], [
RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
]) ])
@ -3857,7 +3857,7 @@ AS_CASE("$enable_shared", [yes], [
], ],
[freebsd*|dragonfly*], [ [freebsd*|dragonfly*], [
SOLIBS='$(LIBS)' SOLIBS='$(LIBS)'
LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION:.=)' LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
LIBRUBY_SO='$(LIBRUBY_SONAME)' LIBRUBY_SO='$(LIBRUBY_SONAME)'
AS_IF([test "$rb_cv_binary_elf" != "yes" ], [ AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
@ -3866,7 +3866,7 @@ AS_CASE("$enable_shared", [yes], [
], ],
[netbsd*], [ [netbsd*], [
SOLIBS='$(LIBS)' SOLIBS='$(LIBS)'
LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION:.=)' LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
LIBRUBY_SO='$(LIBRUBY_SONAME).$(TEENY)' LIBRUBY_SO='$(LIBRUBY_SONAME).$(TEENY)'
RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"]) RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
AS_IF([test "$rb_cv_binary_elf" = yes], [ # ELF platforms AS_IF([test "$rb_cv_binary_elf" = yes], [ # ELF platforms