From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8EC/AGcO3V71XgAA0tVLHw (envelope-from ) for ; Sun, 07 Jun 2020 15:57:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0JwjOGYO3V4+eQAAB5/wlQ (envelope-from ) for ; Sun, 07 Jun 2020 15:57:26 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8715C94053B for ; Sun, 7 Jun 2020 15:57:26 +0000 (UTC) Received: from localhost ([::1]:33462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhxfp-0001kh-Gz for larch@yhetil.org; Sun, 07 Jun 2020 11:57:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhxfT-0001Jv-I9 for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhxfT-0005To-9g for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhxfT-0007s6-9E for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41360] [PATCH v4 09/12] gnu: java-openjfx-build: Fix web component linkage. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jun 2020 15:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41360 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41360@debbugs.gnu.org Received: via spool by 41360-submit@debbugs.gnu.org id=B41360.159154537130160 (code B ref 41360); Sun, 07 Jun 2020 15:57:03 +0000 Received: (at 41360) by debbugs.gnu.org; 7 Jun 2020 15:56:11 +0000 Received: from localhost ([127.0.0.1]:54714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxec-0007qI-Qj for submit@debbugs.gnu.org; Sun, 07 Jun 2020 11:56:11 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:62743) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxe4-0007mt-9f for 41360@debbugs.gnu.org; Sun, 07 Jun 2020 11:55:41 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id CD2519D05B for <41360@debbugs.gnu.org>; Sun, 7 Jun 2020 15:24:46 +0000 (UTC) From: Alexey Abramov Date: Sun, 7 Jun 2020 17:55:15 +0200 Message-Id: <20200607155518.1400-10-levenson@mmer.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200607155518.1400-1-levenson@mmer.org> References: <20200607155518.1400-1-levenson@mmer.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 19uXbuIuqCtf * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/java.scm (java-openjfx-build)[source]: Use it. * gnu/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch: New file. Signed-off-by: Alexey Abramov --- gnu/local.mk | 1 + gnu/packages/java.scm | 1 + ...-build-web-WebKitCompilerFlags.cmake.patch | 36 +++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 gnu/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index d36636fd81..85f8db7150 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1113,6 +1113,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-openjfx-build-web-DumpRenderTree-java.patch \ %D%/packages/patches/java-openjfx-build-web-OptionsJava.cmake.patch \ %D%/packages/patches/java-openjfx-build-web-WTF.patch \ + %D%/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index cf6135e926..5da1476077 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2506,6 +2506,7 @@ new Date();")) "java-openjfx-build-web-DumpRenderTree-java.patch" "java-openjfx-build-web-OptionsJava.cmake.patch" "java-openjfx-build-web-WTF.patch" + "java-openjfx-build-web-WebKitCompilerFlags.cmake.patch" )))) (build-system ant-build-system) (arguments diff --git a/gnu/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch b/gnu/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch new file mode 100644 index 0000000000..d0bbb7e3b2 --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-web-WebKitCompilerFlags.cmake.patch @@ -0,0 +1,36 @@ +Subject: [PATCH] Fix WebKit linkage. + +Somehow the whole linkage fails because of the TestRunner's undefined +references. However, I see the very same fixes in openjfx8-devel FreeBSD port, +even though they use gradle to build it. + +CMakeFiles/DumpRenderTreeJava.dir/__/TestRunner.cpp.o:TestRunner.cpp:function TestRunner::runUIScript(OpaqueJSContext const*, OpaqueJSString*, OpaqueJSValue const*): error: undefined reference to 'WTF::String::String(unsigned short const*, unsigned int)' +CMakeFiles/DumpRenderTreeJava.dir/__/__/TestRunnerShared/UIScriptContext/UIScriptContext.cpp.o:UIScriptContext.cpp:function WTR::UIScriptContext::tryToCompleteUIScriptForCurrentParentCallback(): error: undefined reference to 'WTF::String::String(unsigned short const*, unsigned int)' + +Some related bugs/commits are: +https://github.com/WebKit/webkit/commit/1e46377e47674363131299d54c8557734a99fb5f +https://bugs.webkit.org/show_bug.cgi?id=199625#c24 +https://bugs.webkit.org/show_bug.cgi?id=200074 + +--- + .../src/main/native/Source/cmake/WebKitCompilerFlags.cmake | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake b/modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake +index 5bcf047..4526ee6 100644 +--- a/modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake ++++ b/modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake +@@ -176,11 +176,6 @@ if (NOT MSVC) + string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS}) + endif () + +-if (UNIX AND NOT APPLE AND NOT ENABLED_COMPILER_SANITIZERS) +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") +-endif () +- +- + # CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0. Since this + # version, -P does not output empty lines, which currently breaks make_names.pl in + # WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to +-- +2.26.2 -- 2.26.2