[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/35: gnu: icedtea-7: Use system lcms and pcsc.
From: |
guix-commits |
Subject: |
14/35: gnu: icedtea-7: Use system lcms and pcsc. |
Date: |
Sat, 18 Dec 2021 11:35:09 -0500 (EST) |
rekado pushed a commit to branch wip-java-bootstrap-simplify
in repository guix.
commit 54a77da1a59b3d9bd82d76174df52eaba0d466cb
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Dec 17 22:23:22 2021 +0100
gnu: icedtea-7: Use system lcms and pcsc.
* gnu/packages/java.scm (icedtea-7)[arguments]: Add configure flags to use
our
pcsc and lcms libraries.
[inputs]: Add pcsc-lite. And use new style.
---
gnu/packages/java.scm | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3895e00..6f039b8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -85,6 +85,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages popt)
#:use-module (gnu packages kerberos)
+ #:use-module (gnu packages security-token)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages texinfo)
@@ -1330,9 +1331,10 @@ bootstrapping purposes.")
(srfi srfi-26))
#:configure-flags
- ;; TODO: package pcsc and sctp, and add to inputs
- `("--disable-system-pcsc"
- "--disable-system-sctp"
+ ;; TODO: package sctp and add to inputs
+ `("--disable-system-sctp"
+ "--enable-system-pcsc"
+ "--enable-system-lcms"
"--enable-bootstrap"
"--enable-nss"
"--without-rhino"
@@ -1794,25 +1796,26 @@ bootstrapping purposes.")
("procps" ,procps) ;for "free", even though I'm not sure we should
use it
("jdk" ,icedtea-6 "jdk")))
(inputs
- `(("alsa-lib" ,alsa-lib)
- ("cups" ,cups)
- ("libx11" ,libx11)
- ("libxcomposite" ,libxcomposite)
- ("libxt" ,libxt)
- ("libxtst" ,libxtst)
- ("libxi" ,libxi)
- ("libxinerama" ,libxinerama)
- ("libxrender" ,libxrender)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("mit-krb5" ,mit-krb5)
- ("nss" ,nss)
- ("giflib" ,giflib)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("lcms" ,lcms)
- ("zlib" ,zlib)
- ("gtk" ,gtk+-2)))
+ (list alsa-lib
+ cups
+ fontconfig
+ freetype
+ giflib
+ gtk+-2
+ lcms
+ libjpeg-turbo
+ libpng
+ libx11
+ libxcomposite
+ libxi
+ libxinerama
+ libxrender
+ libxt
+ libxtst
+ mit-krb5
+ nss
+ pcsc-lite
+ zlib))
(home-page "http://icedtea.classpath.org")
(synopsis "Java development kit")
(description
- 04/35: gnu: ecj-javac-wrapper: Remove trailing #T., (continued)
- 04/35: gnu: ecj-javac-wrapper: Remove trailing #T., guix-commits, 2021/12/18
- 03/35: gnu: ecj-javac-wrapper: Remove rt.jar from classpath., guix-commits, 2021/12/18
- 06/35: gnu: ecj-javac-wrapper-final: Use Guile 3., guix-commits, 2021/12/18
- 11/35: gnu: icedtea-7: Run tests conditionally., guix-commits, 2021/12/18
- 05/35: gnu: ecj-javac-wrapper: Use Guile 3., guix-commits, 2021/12/18
- 10/35: gnu: Add jamvm-with-ecj4., guix-commits, 2021/12/18
- 09/35: gnu: Add ecj4-javac-wrapper., guix-commits, 2021/12/18
- 17/35: gnu: icedtea-8: Remove commented configure flag., guix-commits, 2021/12/18
- 15/35: gnu: icedtea-7: Import missing module for read-line., guix-commits, 2021/12/18
- 13/35: gnu: icedtea-7: Bind INPUTS in 'patch-paths build phase., guix-commits, 2021/12/18
- 14/35: gnu: icedtea-7: Use system lcms and pcsc.,
guix-commits <=
- 20/35: gnu: icedtea-8: Simplify source snippet., guix-commits, 2021/12/18
- 23/35: gnu: ant-bootstrap: Bind OUTPUTS in build phase., guix-commits, 2021/12/18
- 24/35: gnu: ant-bootstrap: Remove trailing #T from build phase., guix-commits, 2021/12/18
- 19/35: gnu: icedtea-8: Remove trailing #T from build phases., guix-commits, 2021/12/18
- 21/35: gnu: icedtea-8: Update to 3.19.0., guix-commits, 2021/12/18
- 22/35: gnu: jamvm-1-bootstrap: Simplify snippet., guix-commits, 2021/12/18
- 25/35: gnu: ecj-bootstrap: Remove trailing #T., guix-commits, 2021/12/18
- 26/35: gnu: ecj-bootstrap: Remove #:modules from arguments., guix-commits, 2021/12/18
- 30/35: gnu: classpath-bootstrap: Use label-less input style., guix-commits, 2021/12/18
- 31/35: gnu: jamvm-1-bootstrap: Use label-less input style., guix-commits, 2021/12/18