From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SOnMLpYiZmLNfgEAbAwnHQ (envelope-from ) for ; Mon, 25 Apr 2022 06:24:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yCfTLZYiZmLNaQEAG6o9tA (envelope-from ) for ; Mon, 25 Apr 2022 06:24:54 +0200 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 3F3A529F3C for ; Mon, 25 Apr 2022 06:24:54 +0200 (CEST) Received: from localhost ([::1]:49692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1niqHN-0004wT-CG for larch@yhetil.org; Mon, 25 Apr 2022 00:24:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nipvb-00080V-Hl for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nipvY-0001nI-Ib for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nipvY-0008F7-Fv for guix-patches@gnu.org; Mon, 25 Apr 2022 00:02:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55104] [PATCH 076/232] gnu: Add java-antlr4-runtime-cpp. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 04:02:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55104 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55104@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55104-submit@debbugs.gnu.org id=B55104.165085932931464 (code B ref 55104); Mon, 25 Apr 2022 04:02:20 +0000 Received: (at 55104) by debbugs.gnu.org; 25 Apr 2022 04:02:09 +0000 Received: from localhost ([127.0.0.1]:60885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipvM-0008BD-DG for submit@debbugs.gnu.org; Mon, 25 Apr 2022 00:02:09 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:35535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nipty-0007sc-Ra for 55104@debbugs.gnu.org; Mon, 25 Apr 2022 00:00:46 -0400 Received: by mail-qt1-f170.google.com with SMTP id bz24so9580956qtb.2 for <55104@debbugs.gnu.org>; Sun, 24 Apr 2022 21:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LrrFobzal5mI7VvsJL725K4TiS+aDcd7RaNTsKGBkQM=; b=mYVmz/W/pZyMBGXlj4fdp569n50avkVVHPHgkh7qtE9mhbdEnYskhtOAV7dJ4HcAd4 o3/L3M+wuY5rrq+i5Lz+h/0DFyF1EMEWAiXh6dzhxciaLLWtOmrhkzHzZw2jM5LysSpY LS9wr1I+91VKgf4JxN9TE8cTziw/RxuRQAHguc4PkC4Hovjy8d4TxSCr1NiFbmiqXK8Z 65T2cAecYuJ5L6/1CSjcMHfy3lPA3M/FCitXsGNt/ZwKI7m4Fo91Ui/aZAodn0agG0/B WV9m0b3qkiJS+PyX0NXJLi/fC7Yllwe63GeECvukdY2gp2vwthx+3sJRyO+XnGXA9lmP FAJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LrrFobzal5mI7VvsJL725K4TiS+aDcd7RaNTsKGBkQM=; b=5lmKHXXjb2rNHb1dwMwjc8xvvFDT9TWGqP1x89EQZbYqMU27VzKhWLHZZaqIB0DkCo Kn+ApsOHJVtsOqUVevXh4mMIseT3x17QnteZHcaxwrBih8VBa80Y5Hhp5q4Qd/GbX4hN i4qm2xhc9Nt5OI4K/vR1Z3OSPQZq+GvHj9lQuW7nA8faQgtvCMpmeRvoFPEcVLJuFvVw f2uthFoWp2RdItrhaNRAzuMrW/UCiCPJcqtbPf9ZGyisimw1hpPPMw89YQ3vfSlUY8De Ht04GxkgfXOGUc+BV0eO/NuY7tlR2Sm9njS+PJTiGCr0XkM4fTySKqdJTcN/nYq80bMI Duuw== X-Gm-Message-State: AOAM532vFmI+mm0Vk4e4DQv6UCIJNAInpbJETuRjH2RXxk5DiB3EzAk7 uYOdvDpgiS9nY1ZJoPGTgi059xx8pJCQpA== X-Google-Smtp-Source: ABdhPJwtHDdyqTb8vcK3qTR/En11NpdLMb0a2QIZgVVYqeY9X4GgcIQ3dypmVdWBaigCU2gjmli37Q== X-Received: by 2002:a05:622a:196:b0:2f1:f8d7:fc97 with SMTP id s22-20020a05622a019600b002f1f8d7fc97mr10517176qtw.343.1650859237275; Sun, 24 Apr 2022 21:00:37 -0700 (PDT) Received: from localhost.localdomain (dsl-150-232.b2b2c.ca. [66.158.150.232]) by smtp.gmail.com with ESMTPSA id w82-20020a376255000000b0069ee3f0ae63sm4478142qkb.45.2022.04.24.21.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 21:00:36 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 24 Apr 2022 23:56:42 -0400 Message-Id: <20220425035918.25683-76-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220425035918.25683-1-maxim.cournoyer@gmail.com> References: <20220425035918.25683-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1650860694; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LrrFobzal5mI7VvsJL725K4TiS+aDcd7RaNTsKGBkQM=; b=W3/94YzYwbyrpaC1sMKAytYMeNZNXl6SGHLzlE+eZ0t6W+eWgBEDVKBv5wDzxN6nMF7DBS ZfMTSt/0hD7hEKDKl0/RMHrt8bVu9yJzODtEofSpV+aajyYI2m4p8c8o/1ZHgexB0nBzfJ GHc3OHPMr/69vh0Wj966e5bh/OoRQNMvOe9xf+BquAzWv2ZRgDrBqJunxxjgz62f/S0gH3 wxLpKlGZ6OSbCnkSUMhnq01O5/9aTk8nvzBmGVTvdiBy2HwojubHK9fJsAAsN29XWC0C8y imBCHjEQ7rlzZaUvl48UzMBG9WEoYqZRw4Tc8k5ClarxHL04Bekoa5OSNiSvtw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650860694; a=rsa-sha256; cv=none; b=nVK6z4qYmXjxF+iNv6UXcRHR0Ma3wgDbcsdZuQrVj2+LCYfpWNqqaBGRGr5ShOacqihzJQ rik1lUHkw6+TbyQNV8CYsbdgnx9sXvSovJqOiz0rM68i2Ji6VGJWKBRR55hECY23WTq98U ZwQ3TZQZeustpslqq9us/rXj+M++SyLpf83rB+7G72UtDy3yrIW2DPaqMovOFXdP8U1tUT URVXDBKvDpeCb4ONW18wT8cafpbMvPagQOevjDVzQy99k+DhusHgiTquADmsFvilWemx7W uKhDDH4CMS71r8d5RuXHYb2Ltt0ZYEbakG4CZqFtz0PhNx8kN3JGEVB7PEUxMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="mYVmz/W/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="mYVmz/W/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3F3A529F3C X-Spam-Score: 7.49 X-Migadu-Scanner: scn1.migadu.com X-TUID: Ec0rS7GVc3R6 * gnu/packages/java.scm (java-antlr4-runtime-cpp): New variable. --- gnu/packages/java.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43422f383f..539a6e6f6a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019, 2020, 2021 Björn Höfling ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2021 Vincent Legoll ;;; Copyright © 2021 Mike Gerwitz ;;; Copyright © 2021 Pierre Langlois @@ -45,6 +45,7 @@ (define-module (gnu packages java) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix build-system ant) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system maven) #:use-module (guix build-system trivial) @@ -8619,6 +8620,38 @@ (define-public java-antlr4-runtime sources by ANTLR.") (license license:bsd-3))) +(define-public java-antlr4-runtime-cpp + (package + (inherit java-antlr4-runtime) + (name "java-antlr4-runtime-cpp") + (outputs '("out" "static")) + (build-system cmake-build-system) + (arguments + (list + ;; TODO: try to run the tests under + ;; runtime-testsuite/test/org/antlr/v4/test/runtime/cpp with antlr4. + #:tests? #f ;no CMake test target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "runtime/Cpp"))) + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((static (assoc-ref outputs "static")) + (libantlr4-runtime.a (search-input-file + outputs "lib/libantlr4-runtime.a"))) + (mkdir-p (string-append static "/lib")) + (rename-file + libantlr4-runtime.a + (string-append static "/lib/" + (basename libantlr4-runtime.a))))))))) + (native-inputs (list pkg-config)) + (inputs (list `(,util-linux "lib"))) ;libuuid + (synopsis "ANTL C++ runtime library") + (description "This package contains the C++ runtime library used with C++ +generated sources by ANTLR."))) + (define-public antlr4 (package (inherit java-antlr4-runtime) -- 2.34.0