From patchwork Sun Jun 7 15:55:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 22588 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9684027BBE4; Sun, 7 Jun 2020 16:57:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 25B9127BBE1 for ; Sun, 7 Jun 2020 16:57:15 +0100 (BST) Received: from localhost ([::1]:60724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhxfe-0001LF-LT for patchwork@mira.cbaines.net; Sun, 07 Jun 2020 11:57:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhxfS-0001Jn-Q7 for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhxfS-0005TG-Hi for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhxfS-0007rr-Gx for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41360] [PATCH v4 07/12] gnu: java-openjfx-build: Do not use an embedded 3rd party libraries. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jun 2020 15:57:02 +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.159154536730143 (code B ref 41360); Sun, 07 Jun 2020 15:57:02 +0000 Received: (at 41360) by debbugs.gnu.org; 7 Jun 2020 15:56:07 +0000 Received: from localhost ([127.0.0.1]:54710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxeX-0007pz-ID for submit@debbugs.gnu.org; Sun, 07 Jun 2020 11:56:07 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:62725) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxe1-0007mj-MJ 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 751039CFD1 for <41360@debbugs.gnu.org>; Sun, 7 Jun 2020 15:24:46 +0000 (UTC) From: Alexey Abramov Date: Sun, 7 Jun 2020 17:55:13 +0200 Message-Id: <20200607155518.1400-8-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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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-OptionsJava.cmake.patch: New file. Signed-off-by: Alexey Abramov --- gnu/local.mk | 1 + gnu/packages/java.scm | 1 + ...-openjfx-build-web-OptionsJava.cmake.patch | 32 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 gnu/packages/patches/java-openjfx-build-web-OptionsJava.cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index f8a59da3da..71b2cf1d69 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-openjfx-build-swing-JFXPanel-JDK8.patch \ %D%/packages/patches/java-openjfx-build-web-DumpRenderTree-java.patch \ + %D%/packages/patches/java-openjfx-build-web-OptionsJava.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 d60ae7c8f1..8ce8043335 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2504,6 +2504,7 @@ new Date();")) (patches (search-patches "java-openjfx-build-jdk_version.patch" "java-openjfx-build-swing-JFXPanel-JDK8.patch" "java-openjfx-build-web-DumpRenderTree-java.patch" + "java-openjfx-build-web-OptionsJava.cmake.patch" )))) (build-system ant-build-system) (arguments diff --git a/gnu/packages/patches/java-openjfx-build-web-OptionsJava.cmake.patch b/gnu/packages/patches/java-openjfx-build-web-OptionsJava.cmake.patch new file mode 100644 index 0000000000..1f133571cb --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-web-OptionsJava.cmake.patch @@ -0,0 +1,32 @@ +Subject: [PATCH] Use find_package. + +We remove all embedded 3rd-party libs like icu, libxml, libxslt and sqlite, +and use libraries provided via guix inputs. +--- + .../web/src/main/native/Source/cmake/OptionsJava.cmake | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/modules/web/src/main/native/Source/cmake/OptionsJava.cmake b/modules/web/src/main/native/Source/cmake/OptionsJava.cmake +index 76a6695..73c525b 100644 +--- a/modules/web/src/main/native/Source/cmake/OptionsJava.cmake ++++ b/modules/web/src/main/native/Source/cmake/OptionsJava.cmake +@@ -26,13 +26,11 @@ endif () + set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory") + set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory") + +-set(SQLITE_LIBRARIES SqliteJava) +-set(LIBXML2_LIBRARIES XMLJava) +-set(LIBXSLT_LIBRARIES XSLTJava) + +-set(ICU_LIBRARIES icuuc icudata) +-set(ICU_I18N_LIBRARIES icui18n icuuc icudata) +-set(ICU_DATA_LIBRARIES icudata) ++find_package(Sqlite REQUIRED) ++find_package(LibXml2 REQUIRED) ++find_package(LibXslt REQUIRED) ++find_package(ICU REQUIRED) + + find_package(JNI REQUIRED) + find_package(Threads REQUIRED) +-- +2.26.2