ruby-changes:72231
From: nagachika <ko1@a...>
Date: Sat, 18 Jun 2022 16:38:09 +0900 (JST)
Subject: [ruby-changes:72231] 702f7c8417 (ruby_3_1): merge revision(s) 222203297966f312109e8eaa2520f2cf2f59c09d: [Backport #18672]
https://git.ruby-lang.org/ruby.git/commit/?id=702f7c8417 From 702f7c8417e2a47bd88ef72fd705c1739cd958de Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sat, 18 Jun 2022 16:05:31 +0900 Subject: merge revision(s) 222203297966f312109e8eaa2520f2cf2f59c09d: [Backport #18672] Remove dependency on libcapstone We have received reports of build failures due to this configuration check modifying compile flags. Since only YJIT devs use this library we can remove it to make Ruby easier to build for users. See: https://github.com/rbenv/ruby-build/discussions/1933 --- configure.ac | 9 --------- 1 file changed, 9 deletions(-) --- configure.ac | 9 --------- version.h | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 5a6b074f8a..951a664aa5 100644 --- a/configure.ac +++ b/configure.ac @@ -1244,15 +1244,6 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV https://github.com/ruby/ruby/blob/trunk/configure.ac#L1244 AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX AC_CHECK_LIB(socket, shutdown) # SunOS/Solaris -if pkg-config --exists capstone; then - CAPSTONE_CFLAGS=`pkg-config --cflags capstone` - CAPSTONE_LIB_L=`pkg-config --libs-only-L capstone` - LDFLAGS="$LDFLAGS $CAPSTONE_LIB_L" - CFLAGS="$CFLAGS $CAPSTONE_CFLAGS" -fi - -AC_CHECK_LIB(capstone, cs_open) # Capstone disassembler for debugging YJIT - dnl Checks for header files. AC_HEADER_DIRENT dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS diff --git a/version.h b/version.h index 80636ea154..d9c2de3f62 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # 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 33 +#define RUBY_PATCHLEVEL 34 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 6 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/