зеркало из https://github.com/github/ruby.git
fix library teeny
* configure.in, win32/Makefile.sub: fix teeny of library version to 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
6837c6483f
Коммит
34b1c7ddd6
|
@ -3705,7 +3705,7 @@ AS_CASE("$enable_shared", [yes], [
|
|||
LIBRUBY_RELATIVE=yes
|
||||
fi
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_PROGRAM_VERSION)'
|
||||
if test "$visibility_option" = ld; then
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
|
||||
|
@ -3924,7 +3924,7 @@ AS_CASE(["$target_os"],
|
|||
fi
|
||||
],
|
||||
[cygwin*|mingw*], [
|
||||
RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
|
||||
RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0'
|
||||
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
|
||||
AS_CASE(["$target_os"],
|
||||
[cygwin*], [
|
||||
|
|
|
@ -100,7 +100,7 @@ clean-local::
|
|||
@$(RM) $(RUBYDEF)
|
||||
|
||||
ifeq (@target_os@,cygwin)
|
||||
cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
|
||||
cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF)
|
||||
$(ECHO) generating $@
|
||||
$(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
|
||||
endif
|
||||
|
|
|
@ -135,11 +135,11 @@ PLATFORM_DIR = win32
|
|||
arch = $(ARCH)-$(PLATFORM)
|
||||
sitearch = $(ARCH)-$(RT)
|
||||
!if !defined(ruby_version)
|
||||
ruby_version = $(MAJOR).$(MINOR).$(TEENY)
|
||||
ruby_version = $(MAJOR).$(MINOR).0
|
||||
!endif
|
||||
|
||||
!ifndef RUBY_SO_NAME
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)$(TEENY)
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(ruby_version:.=)
|
||||
!if "$(ARCH)" != "i386"
|
||||
RUBY_SO_NAME = $(ARCH)-$(RUBY_SO_NAME)
|
||||
!endif
|
||||
|
|
Загрузка…
Ссылка в новой задаче