| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 222203297966f312109e8eaa2520f2cf2f59c09d Mon Sep 17 00:00:00 2001 |
| 2 | From: Alan Wu <XrXr@users.noreply.github.com> |
| 3 | Date: Thu, 31 Mar 2022 17:26:28 -0400 |
| 4 | Subject: [PATCH] Remove dependency on libcapstone |
| 5 | |
| 6 | We have received reports of build failures due to this configuration |
| 7 | check modifying compile flags. Since only YJIT devs use this library |
| 8 | we can remove it to make Ruby easier to build for users. |
| 9 | |
| 10 | See: https://github.com/rbenv/ruby-build/discussions/1933 |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | --- |
| 14 | configure.ac | 9 --------- |
| 15 | 1 file changed, 9 deletions(-) |
| 16 | |
| 17 | Index: ruby-3.1.2/configure.ac |
| 18 | =================================================================== |
| 19 | --- ruby-3.1.2.orig/configure.ac |
| 20 | +++ ruby-3.1.2/configure.ac |
| 21 | @@ -1244,15 +1244,6 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linki |
| 22 | AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX |
| 23 | AC_CHECK_LIB(socket, shutdown) # SunOS/Solaris |
| 24 | |
| 25 | -if pkg-config --exists capstone; then |
| 26 | - CAPSTONE_CFLAGS=`pkg-config --cflags capstone` |
| 27 | - CAPSTONE_LIB_L=`pkg-config --libs-only-L capstone` |
| 28 | - LDFLAGS="$LDFLAGS $CAPSTONE_LIB_L" |
| 29 | - CFLAGS="$CFLAGS $CAPSTONE_CFLAGS" |
| 30 | -fi |
| 31 | - |
| 32 | -AC_CHECK_LIB(capstone, cs_open) # Capstone disassembler for debugging YJIT |
| 33 | - |
| 34 | dnl Checks for header files. |
| 35 | AC_HEADER_DIRENT |
| 36 | dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS |