From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 48382@debbugs.gnu.org
Subject: [bug#48382] [PATCH 5/6] gnu: java-pep-adapter 2.1.23.
Date: Wed, 12 May 2021 19:42:17 +0200 [thread overview]
Message-ID: <6d85b23c4d60c2062e3afdd64e83305be92a15f4.1620840984.git.h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <9f40b4002667ba7c9e83f4c9aab84b7a88e94a19.1620840984.git.h.goebel@crazy-compilers.com>
* gnu/packages/pep.scm (java-pep-adapter): Update to 2.1.23.
[source]: Switch to new git repo.
[arguments]<make-flags>: Enable release-build, use new target names.
[arguments]<phases>{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 <mutex>\n"
- "#include <cassert>\n"
- "#include <cstring>\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
--
2.21.4
next prev parent reply other threads:[~2021-05-12 17:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 17:39 [bug#48382] [PATCH 1/6] gnu: yml2: Update to 2.7.0 Hartmut Goebel
2021-05-12 17:42 ` [bug#48382] [PATCH 2/6] gnu: pep-engine: Update to 2.1.33 Hartmut Goebel
2021-05-12 17:42 ` [bug#48382] [PATCH 3/6] gnu: libpEpAdapter: Update to 2.1.21 Hartmut Goebel
2021-05-12 17:42 ` [bug#48382] [PATCH 4/6] gnu: python-pep-adapter: Update to 2.1.3 Hartmut Goebel
2021-05-12 17:42 ` Hartmut Goebel [this message]
[not found] ` <handler.48382.B.162084121518964.ack@debbugs.gnu.org>
2021-05-31 8:47 ` bug#48382: Acknowledgement ([PATCH 1/6] gnu: yml2: Update to 2.7.0.) Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6d85b23c4d60c2062e3afdd64e83305be92a15f4.1620840984.git.h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=48382@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).