ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 07:34:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add support for openjdk-src builds with OpenJDK 8

Browse Source 
I've tested this on Linux with both OpenJDK 7 and 8.  Other platforms
will probably require further changes.
This commit is contained in:
Joel Dice 2014-04-23 17:09:52 -06:00
parent 7de555c797
commit 129626d91f
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefile
View File

@ -120,16 +120,24 @@ ifneq ($(openjdk),)
openjdk-jar-dep = $(build)/openjdk-jar.dep openjdk-jar-dep = $(build)/openjdk-jar.dep
classpath-jar-dep = $(openjdk-jar-dep) classpath-jar-dep = $(openjdk-jar-dep)
javahome = $(embed-prefix)/javahomeJar javahome = $(embed-prefix)/javahomeJar
javahome-files = lib/zi lib/currency.data lib/security/java.security \ javahome-files = lib/currency.data lib/security/java.security \
lib/security/java.policy lib/security/cacerts lib/security/java.policy lib/security/cacerts
ifneq (,$(wildcard $(openjdk)/jre/lib/zi))
javahome-files += lib/zi
endif
ifneq (,$(wildcard $(openjdk)/jre/lib/tzdb.dat))
javahome-files += lib/tzdb.dat
endif
local-policy = lib/security/local_policy.jar local-policy = lib/security/local_policy.jar
ifeq ($(shell test -e "$(openjdk)/jre/$(local-policy)" && echo found),found) ifneq (,$(wildcard $(openjdk)/jre/$(local-policy)))
javahome-files += $(local-policy) javahome-files += $(local-policy)
endif endif
export-policy = lib/security/US_export_policy.jar export-policy = lib/security/US_export_policy.jar
ifeq ($(shell test -e "$(openjdk)/jre/$(export-policy)" && echo found),found) ifneq (,$(wildcard $(openjdk)/jre/$(export-policy)))
javahome-files += $(export-policy) javahome-files += $(export-policy)
endif endif

9
openjdk-src.mk
View File

@ -19,10 +19,10 @@ openjdk-sources = \
$(openjdk-src)/share/native/java/lang/Float.c \ $(openjdk-src)/share/native/java/lang/Float.c \
$(openjdk-src)/share/native/java/lang/Object.c \ $(openjdk-src)/share/native/java/lang/Object.c \
$(openjdk-src)/share/native/java/lang/Package.c \ $(openjdk-src)/share/native/java/lang/Package.c \
$(openjdk-src)/share/native/java/lang/ref/Finalizer.c \ $(wildcard $(openjdk-src)/share/native/java/lang/ref/Finalizer.c) \
$(openjdk-src)/share/native/java/lang/reflect/Array.c \ $(openjdk-src)/share/native/java/lang/reflect/Array.c \
$(openjdk-src)/share/native/java/lang/reflect/Proxy.c \ $(openjdk-src)/share/native/java/lang/reflect/Proxy.c \
$(openjdk-src)/share/native/java/lang/ResourceBundle.c \ $(wildcard $(openjdk-src)/share/native/java/lang/ResourceBundle.c) \
$(openjdk-src)/share/native/java/lang/Runtime.c \ $(openjdk-src)/share/native/java/lang/Runtime.c \
$(openjdk-src)/share/native/java/lang/SecurityManager.c \ $(openjdk-src)/share/native/java/lang/SecurityManager.c \
$(openjdk-src)/share/native/java/lang/Shutdown.c \ $(openjdk-src)/share/native/java/lang/Shutdown.c \
@ -38,7 +38,7 @@ openjdk-sources = \
$(openjdk-src)/share/native/java/net/Inet6Address.c \ $(openjdk-src)/share/native/java/net/Inet6Address.c \
$(openjdk-src)/share/native/java/nio/Bits.c \ $(openjdk-src)/share/native/java/nio/Bits.c \
$(openjdk-src)/share/native/java/security/AccessController.c \ $(openjdk-src)/share/native/java/security/AccessController.c \
$(openjdk-src)/share/native/java/sql/DriverManager.c \ $(wildcard $(openjdk-src)/share/native/java/sql/DriverManager.c) \
$(openjdk-src)/share/native/java/util/concurrent/atomic/AtomicLong.c \ $(openjdk-src)/share/native/java/util/concurrent/atomic/AtomicLong.c \
$(openjdk-src)/share/native/java/util/TimeZone.c \ $(openjdk-src)/share/native/java/util/TimeZone.c \
$(openjdk-src)/share/native/java/util/zip/Adler32.c \ $(openjdk-src)/share/native/java/util/zip/Adler32.c \
@ -250,11 +250,12 @@ else
$(openjdk-src)/solaris/native/java/io/FileDescriptor_md.c \ $(openjdk-src)/solaris/native/java/io/FileDescriptor_md.c \
$(openjdk-src)/solaris/native/java/io/FileInputStream_md.c \ $(openjdk-src)/solaris/native/java/io/FileInputStream_md.c \
$(openjdk-src)/solaris/native/java/io/FileOutputStream_md.c \ $(openjdk-src)/solaris/native/java/io/FileOutputStream_md.c \
$(openjdk-src)/solaris/native/java/io/FileSystem_md.c \ $(wildcard $(openjdk-src)/solaris/native/java/io/FileSystem_md.c) \
$(openjdk-src)/solaris/native/java/io/io_util_md.c \ $(openjdk-src)/solaris/native/java/io/io_util_md.c \
$(openjdk-src)/solaris/native/java/io/RandomAccessFile_md.c \ $(openjdk-src)/solaris/native/java/io/RandomAccessFile_md.c \
$(openjdk-src)/solaris/native/java/io/UnixFileSystem_md.c \ $(openjdk-src)/solaris/native/java/io/UnixFileSystem_md.c \
$(openjdk-src)/solaris/native/java/lang/java_props_md.c \ $(openjdk-src)/solaris/native/java/lang/java_props_md.c \
$(wildcard $(openjdk-src)/solaris/native/java/lang/childproc.c) \
$(openjdk-src)/solaris/native/java/lang/ProcessEnvironment_md.c \ $(openjdk-src)/solaris/native/java/lang/ProcessEnvironment_md.c \
$(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c \ $(openjdk-src)/solaris/native/java/lang/UNIXProcess_md.c \
$(openjdk-src)/solaris/native/java/net/net_util_md.c \ $(openjdk-src)/solaris/native/java/net/net_util_md.c \