From patchwork Sun Jun 7 15:55:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 22590 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 6D0E827BBE1; Sun, 7 Jun 2020 16:57:20 +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 03A0027BBE3 for ; Sun, 7 Jun 2020 16:57:20 +0100 (BST) Received: from localhost ([::1]:33018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhxfj-0001Zf-I6 for patchwork@mira.cbaines.net; Sun, 07 Jun 2020 11:57:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhxfT-0001Jt-5e for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhxfS-0005TM-TM 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-0007rz-TN for guix-patches@gnu.org; Sun, 07 Jun 2020 11:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41360] [PATCH v4 11/12] gnu: java-openjfx-build: Ensure use of system provided 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.159154537030153 (code B ref 41360); Sun, 07 Jun 2020 15:57:02 +0000 Received: (at 41360) by debbugs.gnu.org; 7 Jun 2020 15:56:10 +0000 Received: from localhost ([127.0.0.1]:54712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxeZ-0007q8-9g for submit@debbugs.gnu.org; Sun, 07 Jun 2020 11:56:10 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:62717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhxe4-0007mb-So 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 31A5B9D0CE for <41360@debbugs.gnu.org>; Sun, 7 Jun 2020 15:24:47 +0000 (UTC) From: Alexey Abramov Date: Sun, 7 Jun 2020 17:55:17 +0200 Message-Id: <20200607155518.1400-12-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/packages/java.scm (java-openjfx-build)[source]: Delete source code of embedded 3rd party libraries. Signed-off-by: Alexey Abramov --- gnu/packages/java.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a17da610d2..1b6b494700 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2497,6 +2497,9 @@ new Date();")) '(begin ;; Delete included gradle jar (delete-file-recursively "gradle/wrapper") + ;; Delete source code of a ThirdParty libraries + (delete-file-recursively "modules/web/src/main/native/Source/ThirdParty") + (delete-file-recursively "modules/web/src/main/native/Source/PlatformJava.cmake") #t)) (sha256 (base32