summaryrefslogtreecommitdiff
path: root/package/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'package/openjdk')
-rw-r--r--package/openjdk/Makefile57
-rw-r--r--package/openjdk/patches/cxxflags-nozlib.patch31
-rw-r--r--package/openjdk/patches/disable-sizers.patch12
-rw-r--r--package/openjdk/patches/icedtea6-Makefile_in.patch46
-rw-r--r--package/openjdk/patches/qemu-sizer.patch22
-rw-r--r--package/openjdk/patches/rename-libnet.patch127
6 files changed, 198 insertions, 97 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index ad8f29778..2c953c0fe 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -17,17 +17,16 @@ PKG_DESCR:= OpenJDK Java VM
PKG_SECTION:= lang
PKG_BUILDDEP:= alsa-lib xproto jpeg zlib giflib libpng freetype cups
PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv
-PKG_DEPENDS:= zlib libstdcxx libffi libpthread
+PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi
PKG_URL:= http://openjdk.org/
PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \
http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
http://icedtea.classpath.org/download/drops/ \
http://icedtea.classpath.org/download/source/
-#PKG_CFLINE_OPENJDK:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
PKG_HOST_DEPENDS:= !darwin !cygwin !openbsd !netbsd !freebsd
PKG_ARCH_DEPENDS:= arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:= !lemote-yeelong !linksys-ag241 !fon-fon2100
+PKG_SYSTEM_DEPENDS:= !lemote-yeelong !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
# autotools infrastructure for OpenJDK
ICEDTEA_NAME:= icedtea6
@@ -55,13 +54,14 @@ PKGCD_ZERO:= zero-assembly backend
PKGCD_SHARK:= Shark JIT backend (needs eglibc/glibc)
PKGCB_SHARK:= llvm
PKGCD_CACAO:= Cacao JIT backend
-PKGCD_JAMVM:= JamVM backend
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
+# segfaults with march=pentium-m/atom
+TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS))
+TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
@@ -75,13 +75,8 @@ endif
ifeq ($(ADK_PACKAGE_OPENJDK_CACAO),y)
CONFIGURE_BACKEND:= --enable-cacao
endif
-ifeq ($(ADK_PACKAGE_OPENJDK_JAMVM),y)
-CONFIGURE_BACKEND:= --enable-jamvm
-endif
-CONFIGURE_ARGS+= $(CONFIGURE_BACKEND)
-CONFIGURE_ARGS+= --disable-docs \
- --disable-bootstrap \
+CONFIGURE_COMMON:= --disable-docs \
--enable-openjdk-cross-compilation \
--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
@@ -97,18 +92,18 @@ CONFIGURE_ARGS+= --disable-docs \
--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
--without-rhino
+CONFIGURE_ARGS+= $(CONFIGURE_BACKEND)
+CONFIGURE_ARGS+= $(CONFIGURE_COMMON)
+CONFIGURE_ARGS+= --disable-bootstrap
+
CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin
MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
- GCC_HONOUR_COPTS=s \
- TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
+ OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
+ OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \
+ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH)
-OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
- ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
- PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
- GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
- TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
ALL_TARGET:= icedtea
# add include path for Xrender.h from staging directory
@@ -117,6 +112,7 @@ ifeq ($(QEMU),)
$(error Fatal error: $$QEMU not set!)
endif
$(SED) "s#@ADK_TARGETDIR@#$(STAGING_TARGET_DIR)#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/sun/xawt/Makefile
+ $(SED) "s#OTHER_CXXFLAGS#CXXFLAGS_COMMON#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/com/sun/java/pack/Makefile
do-extract:
cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \
@@ -128,7 +124,7 @@ do-extract:
pre-configure:
cd ${WRKBUILD}; rm -rf config.{cache,status}; \
- export $(MAKE_ENV) ${OPENJDK_NATIVE_ENV} ; ./configure \
+ export $(MAKE_ENV); ./configure \
${CONFIGURE_TRIPLE} \
$(CONFIGURE_BACKEND) \
--prefix=/usr \
@@ -139,26 +135,8 @@ pre-configure:
--localstatedir=/var \
--sysconfdir=/etc \
--enable-bootstrap \
- --enable-openjdk-cross-compilation \
- --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
- --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
- --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
- --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
- --with-jdk-home=$(BOOTSTRAPJDK) \
- --with-java=$(BOOTSTRAPJDK)/bin/java \
- --with-javac=$(BOOTSTRAPJDK)/bin/javac \
- --with-javah=$(BOOTSTRAPJDK)/bin/javah \
- --with-jar=$(BOOTSTRAPJDK)/bin/jar \
- --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
- --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
- --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
- --with-ecj-jar=$(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar \
- --without-rhino ;\
- mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \
- mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/ ; \
- cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/generated/sun/awt/X11/generator/; \
- cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/; \
- env ${OPENJDK_NATIVE_ENV} $(MAKE) icedtea-ecj
+ $(CONFIGURE_COMMON) ;\
+ env ${MAKE_ENV} $(MAKE) icedtea-ecj
# fixup symlinks to bootstrap jdk
ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java
ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac
@@ -168,5 +146,6 @@ pre-configure:
openjdk-install:
$(INSTALL_DIR) $(IDIR_OPENJDK)/usr
$(CP) $(WRKBUILD)/openjdk.build/j2re-image/* $(IDIR_OPENJDK)/usr
+ rm -rf $(IDIR_OPENJDK)/usr/man
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/patches/cxxflags-nozlib.patch b/package/openjdk/patches/cxxflags-nozlib.patch
new file mode 100644
index 000000000..67812253a
--- /dev/null
+++ b/package/openjdk/patches/cxxflags-nozlib.patch
@@ -0,0 +1,31 @@
+--- w-openjdk-6.orig/icedtea6-1.10/patches/libraries.patch 2011-02-23 23:32:34.602901049 +0100
++++ w-openjdk-6/icedtea6-1.10/patches/libraries.patch 2011-08-24 15:07:24.347475241 +0200
+@@ -24648,7 +24648,7 @@
+ - $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+ -
+ - ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+-- OTHER_CXXFLAGS += $(ZINCLUDE)
++- CXXFLAGS_COMMON += $(ZINCLUDE)
+ - LDDFLAGS += $(ZIPOBJS)
+ + $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
+ + $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
+@@ -24663,7 +24663,7 @@
+ +
+ + OTHER_LDLIBS += -lz
+ else
+- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
++ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
+ - OTHER_LDLIBS += $(JVMLIB)
+ + OTHER_LDLIBS += -lz $(JVMLIB)
+ endif
+--- w-openjdk-6.orig/icedtea6-1.10/patches/linker-libs-order.patch 2011-02-23 23:32:34.653236038 +0100
++++ w-openjdk-6/icedtea6-1.10/patches/linker-libs-order.patch 2011-08-24 15:53:05.047474381 +0200
+@@ -31,7 +31,7 @@
+
+ - OTHER_LDLIBS += -lz
+ else
+- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
++ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI
+ - OTHER_LDLIBS += -lz $(JVMLIB)
+ + OTHER_LDLIBS += $(JVMLIB)
+ endif
diff --git a/package/openjdk/patches/disable-sizers.patch b/package/openjdk/patches/disable-sizers.patch
deleted file mode 100644
index 46325008c..000000000
--- a/package/openjdk/patches/disable-sizers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile 2011-02-28 17:06:12.000000000 +0100
-+++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile 2011-04-13 12:00:18.618922673 +0200
-@@ -237,7 +237,8 @@
- $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
- $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
-
--$(SIZES): $(SIZERS)
-+$(SIZES):
-+ $(prep-target)
- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
diff --git a/package/openjdk/patches/icedtea6-Makefile_in.patch b/package/openjdk/patches/icedtea6-Makefile_in.patch
index 193e008aa..7febd6cac 100644
--- a/package/openjdk/patches/icedtea6-Makefile_in.patch
+++ b/package/openjdk/patches/icedtea6-Makefile_in.patch
@@ -1,41 +1,5 @@
--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.000000000 +0100
+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-04-02 23:33:17.000000000 +0200
-@@ -328,7 +328,7 @@
- am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
--build_alias = @build_alias@
-+build_alias = ${BUILD_ALIAS}
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-@@ -339,7 +339,7 @@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
--host_alias = @host_alias@
-+host_alias = ${HOST_ALIAS}
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-@@ -362,7 +362,7 @@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
--target_alias = @target_alias@
-+target_alias = ${TARGET_ALIAS}
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
-@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow
- @OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
- @OPENJDK_SRC_DIR_FOUND_TRUE@ fi
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \
--@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \
-+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \
- @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \
@@ -1576,7 +1576,7 @@ clean-overlay:
# FIXME (missing): Rename to clone-ecj.
stamps/extract-ecj.stamp: $(OPENJDK_TREE)
@@ -66,13 +30,3 @@
touch stamps/native-ecj.stamp
clean-native-ecj:
-@@ -2167,6 +2167,9 @@
- stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
- @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \
- @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk \
-+@BUILD_JAMVM_TRUE@ --host=$(host_alias) \
-+@BUILD_JAMVM_TRUE@ --build=$(build_alias) \
-+@BUILD_JAMVM_TRUE@ --target=$(target_alias) \
- @BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \
- @BUILD_JAMVM_TRUE@ $(MAKE) ; \
- @BUILD_JAMVM_TRUE@ $(MAKE) install
diff --git a/package/openjdk/patches/qemu-sizer.patch b/package/openjdk/patches/qemu-sizer.patch
new file mode 100644
index 000000000..b0049e852
--- /dev/null
+++ b/package/openjdk/patches/qemu-sizer.patch
@@ -0,0 +1,22 @@
+--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/xawt/Makefile 2011-02-28 17:06:12.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/sun/xawt/Makefile 2011-08-20 18:45:28.499240773 +0200
+@@ -225,7 +225,7 @@
+
+ $(SIZERS): $(SIZERS_C)
+ $(prep-target)
+- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
++ $(CC) -static $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
+
+ $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
+ $(prep-target)
+@@ -243,8 +243,8 @@
+ $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
+ $(CHMOD) +w $@;\
+ else \
+- $(ECHO) GENERATING $@; \
+- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
++ $(ECHO) GENERATING $@ via $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer..; \
++ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
+ fi
+ @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
+ $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
diff --git a/package/openjdk/patches/rename-libnet.patch b/package/openjdk/patches/rename-libnet.patch
new file mode 100644
index 000000000..671c80dcc
--- /dev/null
+++ b/package/openjdk/patches/rename-libnet.patch
@@ -0,0 +1,127 @@
+https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-libnet-renaming.patch?revision=864&view=markup&pathrev=867
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/net/Makefile 2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/net/Makefile 2011-09-02 16:20:55.597991415 +0200
+@@ -25,7 +25,7 @@
+
+ BUILDDIR = ../..
+ PACKAGE = java.net
+-LIBRARY = net
++LIBRARY = javanet
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/nio/Makefile 2011-02-28 17:06:11.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/nio/Makefile 2011-09-02 16:21:37.817990454 +0200
+@@ -135,11 +135,11 @@
+ endif
+ ifeq ($(PLATFORM), linux)
+ COMPILER_WARNINGS_FATAL=true
+-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
+ endif
+ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
+- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
++ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
+ endif # PLATFORM
+
+ #
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2011-09-02 16:22:26.507995127 +0200
+@@ -59,7 +59,7 @@
+ */
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+
+ /**
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2011-09-02 16:22:58.041740544 +0200
+@@ -79,7 +79,7 @@
+ */
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+
+ /**
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java 2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java 2011-09-02 16:23:20.197991292 +0200
+@@ -47,7 +47,7 @@
+ */
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ init();
+ }
+
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java 2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java 2011-09-02 16:23:57.670490341 +0200
+@@ -231,7 +231,7 @@
+ static {
+ preferIPv6Address = java.security.AccessController.doPrivileged(
+ new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
+- AccessController.doPrivileged(new LoadLibraryAction("net"));
++ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+ init();
+ }
+
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java 2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java 2011-09-02 16:24:13.879239438 +0200
+@@ -52,7 +52,7 @@
+ private boolean virtual = false;
+
+ static {
+- AccessController.doPrivileged(new LoadLibraryAction("net"));
++ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+ init();
+ }
+
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2011-02-28 17:06:34.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2011-09-02 16:24:50.877990409 +0200
+@@ -89,7 +89,7 @@
+ }});
+ if (b != null && b.booleanValue()) {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ hasSystemProxies = init();
+ }
+ }
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java 2011-02-28 17:06:35.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java 2011-09-02 16:25:45.749240462 +0200
+@@ -354,7 +354,7 @@
+ return;
+ loaded = true;
+ java.security.AccessController
+- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
++ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
+ java.security.AccessController
+ .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
+ // IOUtil must be initialized; Its native methods are called from
+--- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-02-28 17:06:48.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-09-02 16:26:36.017990742 +0200
+@@ -244,7 +244,7 @@
+
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ }
+
+ }
+--- w-openjdk-6.orig/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-02-28 17:06:51.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2011-09-02 16:27:07.069240501 +0200
+@@ -160,7 +160,7 @@
+
+ static {
+ java.security.AccessController.doPrivileged(
+- new sun.security.action.LoadLibraryAction("net"));
++ new sun.security.action.LoadLibraryAction("javanet"));
+ init0();
+
+ // start the address listener thread
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 22:08:46 +0000