commit: 04ef8c2740346a58ae800cd9ba1dc189277d562c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Apr 5 23:20:25 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Apr 5 23:20:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ef8c27
net-libs/webkit-gtk: respect RUBY_EXECUTABLE for whole build Closes: https://bugs.gentoo.org/771744 Signed-off-by: Sam James <sam <AT> gentoo.org> .../webkit-gtk/files/2.40.0-respect-RUBY.patch | 30 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild | 1 + 7 files changed, 36 insertions(+) diff --git a/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch b/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch new file mode 100644 index 000000000000..058dbb36cb96 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.40.0-respect-RUBY.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/771744 +https://github.com/WebKit/WebKit/pull/12358 + +From 5cda2bac84e6900401810b56ba4de82de714cae0 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Tue, 4 Apr 2023 04:31:01 +0100 +Subject: [PATCH] postprocess-asm rule doesn't respect RUBY_EXECUTABLE + https://bugs.webkit.org/show_bug.cgi?id=254965 + +Reviewed by NOBODY (OOPS!). + +postprocess-asm is a Ruby script with #/!/usr/bin/env ruby as its shebang which +looks up Ruby in PATH. webkit, however, has RUBY_EXECUTABLE as a CMake option. +It's possible for the Ruby used by CMake (and the other rules during the build) +to be different to the first Ruby found in PATH. This makes the usage for postprocess-asm +consistent with other uses in webkit. + +* Source/JavaScriptCore/CMakeLists.txt +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1507,7 +1507,7 @@ endif () + if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP) + message(STATUS "Enabling asm postprocessing") + +- set(LowLevelInterpreter_LAUNCHER "${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm") ++ set(LowLevelInterpreter_LAUNCHER "${RUBY_EXECUTABLE} ${JavaScriptCore_SCRIPTS_SOURCES_DIR}/postprocess-asm") + get_target_property(PROP_RULE_LAUNCH_COMPILE LowLevelInterpreterLib RULE_LAUNCH_COMPILE) + if (PROP_RULE_LAUNCH_COMPILE) + set(LowLevelInterpreter_LAUNCHER "${LowLevelInterpreter_LAUNCHER} ${PROP_RULE_LAUNCH_COMPILE}") + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild index a9832445dcde..e153b458de45 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r410.ebuild @@ -156,6 +156,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/2.38.3-gcc-13.patch eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild index 8f393f7f4889..2ff1d54297c4 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5-r500.ebuild @@ -158,6 +158,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/2.38.3-gcc-13.patch eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild index f4bcc13e3e66..a845061cb588 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.38.5.ebuild @@ -154,6 +154,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/2.38.3-gcc-13.patch eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild index 91bd845a4163..ef3510d3d31e 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r410.ebuild @@ -145,6 +145,7 @@ src_prepare() { cmake_src_prepare gnome2_src_prepare eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild index 6d4bea0a0c88..520cc3925b2f 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0-r600.ebuild @@ -146,6 +146,7 @@ src_prepare() { cmake_src_prepare gnome2_src_prepare eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild index b6fa733b5b32..07c7e859bc5b 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.0.ebuild @@ -143,6 +143,7 @@ src_prepare() { cmake_src_prepare gnome2_src_prepare eapply "${FILESDIR}"/2.38.5-gcc-13.patch + eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } src_configure() {
