ruby-changes:64683
From: nagachika <ko1@a...>
Date: Thu, 31 Dec 2020 15:37:36 +0900 (JST)
Subject: [ruby-changes:64683] 16930b254b (ruby_2_7): merge revision(s) be9dbe1c3eb4bb4cab0bdc42a91ef425bb1eaddd: [Backport #15178]
https://git.ruby-lang.org/ruby.git/commit/?id=16930b254b From 16930b254b4e5397759d6b42845b495041b71321 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Thu, 31 Dec 2020 15:37:15 +0900 Subject: merge revision(s) be9dbe1c3eb4bb4cab0bdc42a91ef425bb1eaddd: [Backport #15178] Fix pthread_setname_np arguments on NetBSD The previous attempt to fix this in b87df1bf243074edb2e6cc8a24bc00df81cebf3c reversed the argument order instead of just fixing the quote escaping. From Takahiro Kambe. Fixes [Bug #15178] diff --git a/configure.ac b/configure.ac index 6766df2..208208d 100644 --- a/configure.ac +++ b/configure.ac @@ -2410,11 +2410,11 @@ AS_IF([test x"$enable_pthread" = xyes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L2410 AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments], [rb_cv_func_pthread_setname_np_arguments= # Linux,AIX, (pthread_self(), name) - # NetBSD (pthread_self(), name, \"%s\") + # NetBSD (pthread_self(), \"%s\", name) # Darwin (name) for mac in \ "(pthread_self(), name)" \ - "(pthread_self(), name, \"%s\")" \ + "(pthread_self(), \"%s\", name)" \ "(name)" \ ; do AC_TRY_COMPILE([ diff --git a/version.h b/version.h index 643c619..7afd8b7 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 142 +#define RUBY_PATCHLEVEL 143 #define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_MONTH 12 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/