[前][次][番号順一覧][スレッド一覧]

ruby-changes:41402

From: nobu <ko1@a...>
Date: Sat, 9 Jan 2016 09:20:28 +0900 (JST)
Subject: [ruby-changes:41402] nobu:r53474 (trunk): fix library teeny

nobu	2016-01-09 09:20:46 +0900 (Sat, 09 Jan 2016)

  New Revision: 53474

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53474

  Log:
    fix library teeny
    
    * configure.in, win32/Makefile.sub: fix teeny of library version
      to 0.

  Modified files:
    trunk/configure.in
    trunk/cygwin/GNUmakefile.in
    trunk/win32/Makefile.sub
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 53473)
+++ cygwin/GNUmakefile.in	(revision 53474)
@@ -100,7 +100,7 @@ clean-local:: https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L100
 	@$(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
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 53473)
+++ win32/Makefile.sub	(revision 53474)
@@ -135,11 +135,11 @@ PLATFORM_DIR = win32 https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L135
 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
Index: configure.in
===================================================================
--- configure.in	(revision 53473)
+++ configure.in	(revision 53474)
@@ -3705,7 +3705,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3705
 	    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"], https://github.com/ruby/ruby/blob/trunk/configure.in#L3924
 	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*], [

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]