ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: icedtea-7: Patch code to enable build with newer glibc.

Browse source 
* gnu/packages/java.scm (icedtea-7)[arguments]: Add build phase
"patch-bitrot".
(icedtea-8)[arguments]: Remove phase "patch-bitrot".
This commit is contained in:
Ricardo Wurmus 2019-09-07 16:25:47 +02:00
parent 64ad3989d7
commit 6b7e09ae6b
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/java.scm
View file

@ -1125,6 +1125,18 @@ (define-public icedtea-7
((name . _) name)) ((name . _) name))
inputs)))) inputs))))
#t))) #t)))
(add-after 'unpack 'patch-bitrot
(lambda _
(substitute* '("patches/boot/revert-6973616.patch"
"openjdk.src/jdk/make/common/shared/Defs-versions.gmk")
(("REQUIRED_FREETYPE_VERSION = 2.2.1")
"REQUIRED_FREETYPE_VERSION = 2.10.1"))
;; As of attr 2.4.48 this header is no longer
;; included. It is provided by the libc instead.
(substitute* '("configure"
"openjdk.src/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c")
(("attr/xattr.h") "sys/xattr.h"))
#t))
(add-after 'unpack 'fix-x11-extension-include-path (add-after 'unpack 'fix-x11-extension-include-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk" (substitute* "openjdk.src/jdk/make/sun/awt/mawt.gmk"
@ -1604,6 +1616,7 @@ (define-public icedtea-8
(delete 'patch-paths) (delete 'patch-paths)
(delete 'set-additional-paths) (delete 'set-additional-paths)
(delete 'patch-patches) (delete 'patch-patches)
(delete 'patch-bitrot)
;; Prevent the keytool from recording the current time when ;; Prevent the keytool from recording the current time when
;; adding certificates at build time. ;; adding certificates at build time.
(add-after 'unpack 'patch-keystore (add-after 'unpack 'patch-keystore