From patchwork Wed May 12 17:42:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 29267 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 5396927BC81; Wed, 12 May 2021 18:43:26 +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,SPF_HELO_PASS,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 ESMTPS id D33F227BC82 for ; Wed, 12 May 2021 18:43:25 +0100 (BST) Received: from localhost ([::1]:34810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgstJ-00029t-22 for patchwork@mira.cbaines.net; Wed, 12 May 2021 13:43:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgssy-000262-0s for guix-patches@gnu.org; Wed, 12 May 2021 13:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57140) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lgssx-0006LN-Lr for guix-patches@gnu.org; Wed, 12 May 2021 13:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lgssx-00052i-KA for guix-patches@gnu.org; Wed, 12 May 2021 13:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48382] [PATCH 5/6] gnu: java-pep-adapter 2.1.23. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 May 2021 17:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48382 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48382@debbugs.gnu.org X-Debbugs-Original-To: 48382@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162084136219322 (code B ref -1); Wed, 12 May 2021 17:43:03 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2021 17:42:42 +0000 Received: from localhost ([127.0.0.1]:40447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgssb-00051Z-Me for submit@debbugs.gnu.org; Wed, 12 May 2021 13:42:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:34930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lgssX-00051G-5K for submit@debbugs.gnu.org; Wed, 12 May 2021 13:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgssW-00017A-Sk for guix-patches@gnu.org; Wed, 12 May 2021 13:42:36 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:34022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgssU-00061J-Rc for guix-patches@gnu.org; Wed, 12 May 2021 13:42:36 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4FgMZ15NMKz1s5D1; Wed, 12 May 2021 19:42:33 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4FgMZ15CvMz1qqwr; Wed, 12 May 2021 19:42:33 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id JKR96cemxRwg; Wed, 12 May 2021 19:42:32 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-59-106.dynamic.mnet-online.de [188.174.59.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Wed, 12 May 2021 19:42:32 +0200 (CEST) Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id A8B976050D; Wed, 12 May 2021 19:42:29 +0200 (CEST) From: Hartmut Goebel Date: Wed, 12 May 2021 19:42:17 +0200 Message-Id: <6d85b23c4d60c2062e3afdd64e83305be92a15f4.1620840984.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.4 In-Reply-To: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com> References: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com> MIME-Version: 1.0 Received-SPF: none client-ip=2001:a60:0:28:0:1:25:1; envelope-from=h.goebel@crazy-compilers.com; helo=mail-out.m-online.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/pep.scm (java-pep-adapter): Update to 2.1.23. [source]: Switch to new git repo. [arguments]: Enable release-build, use new target names. [arguments]{fix-includes}: Remove phase. {pin-shared-lib-path}: Update file paths. {build-codegen}: New phase. {install}: Use "(install)". [native-inputs]: Add graphviz. [inputs]: Fix input util-linux. --- gnu/packages/pep.scm | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 04e7bedf13..b4158a2ead 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -20,7 +20,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix hg-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -28,6 +27,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages documentation) + #:use-module (gnu packages graphviz) #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages mail) ; for libetpan @@ -255,35 +255,26 @@ ENGINE_INC_PATH=~a/include (define-public java-pep-adapter (package (name "java-pep-adapter") - (version "2.0.5") + (version "2.1.23") (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://pep.foundation/dev/repos/pEpJNIAdapter") - (changeset "534537c9cd50"))) ;; r763 - (file-name (string-append name "-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://gitea.pep.foundation/pEp.foundation/pEpJNIAdapter") + (commit (string-append "Release_" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "107ldpssc80bq8kndn2n000000gphj4lqagaiv3fddlfph4vji48")))) + (base32 "1sw3a5ggxcrkghvpp0a6h2lz461x55ldgfw5y4pw7c3gk5wynvjk")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments `(#:test-target "test" - #:make-flags (list "doxy-all") + #:make-flags '("NDEBUG=1" "all" "doc") ; release build #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-includes - (lambda _ - (substitute* "src/jniutils.hh" - (("#pragma once\n" line) - (string-append line - "#include \n" - "#include \n" - "#include \n"))) - #t)) (add-before 'configure 'pin-shared-lib-path (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/foundation/pEp/jniadapter/AbstractEngine.java" + (substitute* "src/java/foundation/pEp/jniadapter/AbstractEngine.java" (("System.loadLibrary\\(\"pEpJNI\"\\);") (string-append "System.load(\"" (assoc-ref outputs "out") @@ -313,16 +304,18 @@ JAVA_HOME=~a (substitute* "src/Makefile" ;; suppress some warnings (("^\\s+OLD_JAVA=") " xxx_OLD_JAVA=")) #t))) + (add-before 'build 'build-codegen + ;; run codegen first to allow parallel build of other parts + (lambda _ + (invoke "make" "-C" "src" "create-dirs" "codegen"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (libout (string-append out "/lib/")) (javaout (string-append out "/share/java/"))) - (mkdir-p libout) - (mkdir-p javaout) - (copy-file "src/libpEpJNI.so" - (string-append libout "/libpEpJNI.so")) - (copy-file "src/pEp.jar" (string-append javaout "/pEp.jar")) + (install-file "dist/libpEpJNI.a" libout) + (install-file "dist/libpEpJNI.so" libout) + (install-file "dist/pEp.jar" javaout) #t))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) @@ -337,13 +330,14 @@ JAVA_HOME=~a #t)))))) (native-inputs `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) ("openjdk" ,openjdk9 "jdk") ("which" ,which) ("yml2" ,yml2))) (inputs `(("libpepadapter" ,libpepadapter) ("pep-engine" ,pep-engine) - ("util-linux" ,util-linux))) ;; uuid.h + ("util-linux" ,util-linux "lib"))) ;; uuid.h (home-page "https://pep.foundation/") (synopsis "Java adapter for p≡p (pretty Easy Privacy)") (description "The p≡p JNI adapter is a Java adapter interface to the p≡p