mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
ruby: drop capstone support
Upstream dropped capstone support and this also causing us reproducibility issues. (From OE-Core rev: d2496a904a7099ef0de818180820ad7b40843a08) Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2bdc042d9c
commit
5974df1983
@@ -0,0 +1,36 @@
|
|||||||
|
From 222203297966f312109e8eaa2520f2cf2f59c09d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alan Wu <XrXr@users.noreply.github.com>
|
||||||
|
Date: Thu, 31 Mar 2022 17:26:28 -0400
|
||||||
|
Subject: [PATCH] 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
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
---
|
||||||
|
configure.ac | 9 ---------
|
||||||
|
1 file changed, 9 deletions(-)
|
||||||
|
|
||||||
|
Index: ruby-3.1.2/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- ruby-3.1.2.orig/configure.ac
|
||||||
|
+++ ruby-3.1.2/configure.ac
|
||||||
|
@@ -1244,15 +1244,6 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linki
|
||||||
|
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
|
||||||
@@ -12,6 +12,7 @@ SRC_URI += " \
|
|||||||
file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \
|
file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \
|
||||||
file://0006-Make-gemspecs-reproducible.patch \
|
file://0006-Make-gemspecs-reproducible.patch \
|
||||||
file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
|
file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
|
||||||
|
file://0001-Remove-dependency-on-libcapstone.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e"
|
SRC_URI[sha256sum] = "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e"
|
||||||
@@ -25,7 +26,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
|
|||||||
# rdoc is off by default due to non-reproducibility reported in
|
# rdoc is off by default due to non-reproducibility reported in
|
||||||
# https://bugs.ruby-lang.org/issues/18456
|
# https://bugs.ruby-lang.org/issues/18456
|
||||||
PACKAGECONFIG[rdoc] = "--enable-install-rdoc,--disable-install-rdoc,"
|
PACKAGECONFIG[rdoc] = "--enable-install-rdoc,--disable-install-rdoc,"
|
||||||
PACKAGECONFIG[capstone] = "--with-capstone=yes, --with-capstone=no"
|
|
||||||
|
|
||||||
EXTRA_OECONF = "\
|
EXTRA_OECONF = "\
|
||||||
--disable-versioned-paths \
|
--disable-versioned-paths \
|
||||||
|
|||||||
Reference in New Issue
Block a user