diff --git a/lib/mk/jnet.mk b/lib/mk/jnet.mk index a99e82e..fbc5014 100644 --- a/lib/mk/jnet.mk +++ b/lib/mk/jnet.mk @@ -12,7 +12,9 @@ SRC_C = bsd_close.c \ Inet6Address.c \ InetAddressImplFactory.c \ NetworkInterface.c \ - PlainSocketImpl.c + PlainSocketImpl.c \ + SocketInputStream.c \ + SocketOutputStream.c INC_DIR += $(JDK_GENERATED)/include/java.base \ $(JDK_BASE)/share/native/include \ diff --git a/ports/jdk.hash b/ports/jdk.hash index 6cee769..f16909c 100644 --- a/ports/jdk.hash +++ b/ports/jdk.hash @@ -1 +1 @@ -65138302b9644d4da43119dd63ac44a6c27cfc3b +1319e74653e97dbabed7ac973345ec6e243cc11b diff --git a/ports/jdk.port b/ports/jdk.port index 0fe9c09..717b4eb 100644 --- a/ports/jdk.port +++ b/ports/jdk.port @@ -2,11 +2,12 @@ LICENSE := GPLv2 VERSION := 64892f1c9874938dfcdc235b5c051dd761cdd833 DOWNLOADS := jdk.archive -NAME(jdk) := jdk.tgz -URL(jdk) := https://api.github.com/repos/dmlloyd/openjdk/tarball/$(VERSION) -SHA(jdk) := d5b032d5d312148d1c15cde975aa43c4dfa4f2441472d70270ffd6aa22a33694 +NAME(jdk) := jdk.tgz +URL(jdk) := https://api.github.com/repos/dmlloyd/openjdk/tarball/$(VERSION) +SHA(jdk) := d5b032d5d312148d1c15cde975aa43c4dfa4f2441472d70270ffd6aa22a33694 TAR_OPT(jdk) := --strip-components=1 --files-from=$(REP_DIR)/src/app/jdk/files.list -DIR(jdk) := src/app/jdk +DIR(jdk) := src/app/jdk +HASH_INPUT += $(REP_DIR)/src/app/jdk/files.list PATCHES := $(addprefix src/app/jdk/patches/,jdk.patch arm.patch \ icache.patch size.patch id.patch lir.patch mutex.patch \ diff --git a/ports/jdk_generated.hash b/ports/jdk_generated.hash index c59dc41..c9e7e1e 100644 --- a/ports/jdk_generated.hash +++ b/ports/jdk_generated.hash @@ -1 +1 @@ -c8620b50778f4ef1fc1b7a2b2261b60354c717e4 +8c39c3ea85e9c0db5b1b55504778078b516a7518 diff --git a/ports/jdk_generated.port b/ports/jdk_generated.port index 5686812..53525cd 100644 --- a/ports/jdk_generated.port +++ b/ports/jdk_generated.port @@ -3,7 +3,7 @@ VERSION := git DOWNLOADS := jdk_generated.git URL(jdk_generated) := https://github.com/ssumpf/jdk_generated.git -REV(jdk_generated) := 59d6c38e37f47474ff2a90e4efbfdb2e370a4a36 +REV(jdk_generated) := b926f9cd244431335a1b0c84d46b56d146731a2f DIR(jdk_generated) := src/app/jdk # vi: set ft=make : diff --git a/src/app/jdk/files.list b/src/app/jdk/files.list index b071fb5..b04c0c9 100644 --- a/src/app/jdk/files.list +++ b/src/app/jdk/files.list @@ -1801,6 +1801,8 @@ dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnet/net_util_md.c dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnet/net_util_md.h dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnet/NetworkInterface.c dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c +dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnet/SocketInputStream.c +dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnet/SocketOutputStream.c dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnio/ch/DatagramDispatcher.c dmlloyd-openjdk-64892f1/jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c