ruby-changes:71267
From: Peter <ko1@a...>
Date: Fri, 25 Feb 2022 03:32:12 +0900 (JST)
Subject: [ruby-changes:71267] 97001638d9 (master): Add ABI version to ruby_version tag on Windows
https://git.ruby-lang.org/ruby.git/commit/?id=97001638d9 From 97001638d96c27a662f6fa8c682c61b0599a9c3c Mon Sep 17 00:00:00 2001 From: Peter Zhu <peter@p...> Date: Thu, 24 Feb 2022 11:20:40 -0500 Subject: Add ABI version to ruby_version tag on Windows --- win32/Makefile.sub | 2 +- win32/setup.mak | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 47a3dcfd5e..95a9ef4508 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -148,7 +148,7 @@ PLATFORM_DIR = win32 https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L148 arch = $(ARCH)-$(PLATFORM) sitearch = $(ARCH)-$(RT) !if !defined(ruby_version) -ruby_version = $(MAJOR).$(MINOR).0 +ruby_version = $(MAJOR).$(MINOR).0+$(ABI_VERSION) !endif !if !defined(RUBY_VERSION_NAME) RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version) diff --git a/win32/setup.mak b/win32/setup.mak index 466c1ef515..ff8003a5f0 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -195,6 +195,7 @@ echo RUBY_RELEASE_DAY = %ruby_release_day:~-2% https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L195 echo MAJOR = RUBY_VERSION_MAJOR echo MINOR = RUBY_VERSION_MINOR echo TEENY = RUBY_VERSION_TEENY +echo ABI_VERSION = RUBY_ABI_VERSION #if defined RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 0 echo RUBY_DEVEL = yes #endif -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/