summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch
diff options
context:
space:
mode:
authorSven Ebenfeld <sven.ebenfeld@gmail.com>2015-04-27 22:12:59 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-04-28 16:09:34 -0300
commit31460be0ffad5fea3d41e50fba3eccce7993e409 (patch)
treec1ccf05f875de56629939494facaf2ce30b9fae5 /recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch
parent00cc75e823ef742fae6966a83dce69b0d2f56a76 (diff)
downloadmeta-java-31460be0ffad5fea3d41e50fba3eccce7993e409.tar.gz
openjdk-7: Add IcedTea 2.5.4 OpenJDK 7u75b13
Signed-off-by: Sven Ebenfeld <sven.ebenfeld@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch')
-rw-r--r--recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch236
1 files changed, 236 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch
new file mode 100644
index 0000000..e32feb0
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-libnet-renaming.patch
@@ -0,0 +1,236 @@
1diff --git openjdk/jdk/make/com/sun/nio/sctp/Makefile openjdk/jdk/make/com/sun/nio/sctp/Makefile
2index 4ae967f..fe669a9 100644
3--- openjdk/jdk/make/com/sun/nio/sctp/Makefile
4+++ openjdk/jdk/make/com/sun/nio/sctp/Makefile
5@@ -64,11 +64,11 @@ ifneq ($(COMPILER_WARNINGS_FATAL),false)
6 COMPILER_WARNINGS_FATAL=true
7 endif
8 #OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
9-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl
10+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -ljavanet -lpthread -ldl
11 endif
12 ifeq ($(PLATFORM), solaris)
13 #LIBSCTP = -lsctp
14-OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
15+OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -ljavanet -lnio
16 endif # PLATFORM
17
18 else # windows
19diff --git openjdk/jdk/make/java/net/Makefile openjdk/jdk/make/java/net/Makefile
20index 7283e45..720f3d3 100644
21--- openjdk/jdk/make/java/net/Makefile
22+++ openjdk/jdk/make/java/net/Makefile
23@@ -25,7 +25,7 @@
24
25 BUILDDIR = ../..
26 PACKAGE = java.net
27-LIBRARY = net
28+LIBRARY = javanet
29 PRODUCT = sun
30 include $(BUILDDIR)/common/Defs.gmk
31
32diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
33index 191f17d..1e5f8e5 100644
34--- openjdk/jdk/make/java/nio/Makefile
35+++ openjdk/jdk/make/java/nio/Makefile
36@@ -403,7 +403,7 @@
37 endif
38
39 ifeq ($(PLATFORM), linux)
40- OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
41+ OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread $(LIBDL)
42 ifeq ($(SYSTEM_GIO), true)
43 OTHER_LDLIBS += $(GIO_LIBS)
44 OTHER_INCLUDES += $(GIO_CFLAGS) -DUSE_SYSTEM_GIO
45@@ -413,15 +413,15 @@
46 endif
47
48 ifeq ($(PLATFORM), macosx)
49-OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -framework CoreFoundation
50+OTHER_LDLIBS += -L$(LIBDIR) -ljava -ljavanet -pthread -framework CoreFoundation
51 endif
52
53 ifeq ($(PLATFORM), solaris)
54 OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
55- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
56+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
57 endif
58 ifeq ($(PLATFORM), aix)
59-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
60+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
61 endif # PLATFORM
62
63 ifeq ($(COMPILE_AGAINST_SYSCALLS), true)
64diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
65index b7f0f2f..b093868 100644
66--- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
67+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
68@@ -69,7 +69,7 @@
69 */
70 static {
71 java.security.AccessController.doPrivileged(
72- new sun.security.action.LoadLibraryAction("net"));
73+ new sun.security.action.LoadLibraryAction("javanet"));
74 init();
75 }
76
77diff --git openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
78index c6a38ad..97de65b 100644
79--- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
80+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
81@@ -78,7 +78,7 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
82 */
83 static {
84 java.security.AccessController.doPrivileged(
85- new sun.security.action.LoadLibraryAction("net"));
86+ new sun.security.action.LoadLibraryAction("javanet"));
87 }
88
89 /**
90diff --git openjdk/jdk/src/share/classes/java/net/DatagramPacket.java openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
91index 195ee86..6822a57 100644
92--- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
93+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java
94@@ -47,7 +47,7 @@ class DatagramPacket {
95 */
96 static {
97 java.security.AccessController.doPrivileged(
98- new sun.security.action.LoadLibraryAction("net"));
99+ new sun.security.action.LoadLibraryAction("javanet"));
100 init();
101 }
102
103diff --git openjdk/jdk/src/share/classes/java/net/InetAddress.java openjdk/jdk/src/share/classes/java/net/InetAddress.java
104index 3ea28e4..7c78eae 100644
105--- openjdk/jdk/src/share/classes/java/net/InetAddress.java
106+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java
107@@ -260,7 +260,7 @@ class InetAddress implements java.io.Serializable {
108 static {
109 preferIPv6Address = java.security.AccessController.doPrivileged(
110 new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
111- AccessController.doPrivileged(new LoadLibraryAction("net"));
112+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
113 init();
114 }
115
116diff --git openjdk/jdk/src/share/classes/java/net/NetworkInterface.java openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
117index 6314d15..761fdda 100644
118--- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
119+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java
120@@ -53,7 +53,7 @@ public final class NetworkInterface {
121 private static final int defaultIndex; /* index of defaultInterface */
122
123 static {
124- AccessController.doPrivileged(new LoadLibraryAction("net"));
125+ AccessController.doPrivileged(new LoadLibraryAction("javanet"));
126 init();
127 defaultInterface = DefaultInterface.getDefault();
128 if (defaultInterface != null) {
129diff --git openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
130index 5baca6e..befd0b9 100644
131--- openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
132+++ openjdk/jdk/src/share/classes/sun/net/sdp/SdpSupport.java
133@@ -76,6 +76,6 @@ public final class SdpSupport {
134
135 static {
136 AccessController.doPrivileged(
137- new sun.security.action.LoadLibraryAction("net"));
138+ new sun.security.action.LoadLibraryAction("javanet"));
139 }
140 }
141diff --git openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
142index d7aa358..9b2c719 100644
143--- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
144+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
145@@ -95,7 +95,7 @@ public class DefaultProxySelector extends ProxySelector {
146 }});
147 if (b != null && b.booleanValue()) {
148 java.security.AccessController.doPrivileged(
149- new sun.security.action.LoadLibraryAction("net"));
150+ new sun.security.action.LoadLibraryAction("javanet"));
151 hasSystemProxies = init();
152 }
153 }
154diff --git openjdk/jdk/src/share/classes/sun/nio/ch/Util.java openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
155index 10662df..34d441a 100644
156--- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
157+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java
158@@ -483,7 +483,7 @@ class Util {
159 return;
160 loaded = true;
161 java.security.AccessController
162- .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
163+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
164 java.security.AccessController
165 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
166 // IOUtil must be initialized; Its native methods are called from
167diff --git openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
168index 3695b5d..7c833cc 100644
169--- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
170+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
171@@ -247,7 +247,7 @@ public class ResolverConfigurationImpl
172
173 static {
174 java.security.AccessController.doPrivileged(
175- new sun.security.action.LoadLibraryAction("net"));
176+ new sun.security.action.LoadLibraryAction("javanet"));
177 }
178
179 }
180diff --git openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
181index 7970885..46ab112 100644
182--- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
183+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
184@@ -159,7 +159,7 @@ public class ResolverConfigurationImpl
185
186 static {
187 java.security.AccessController.doPrivileged(
188- new sun.security.action.LoadLibraryAction("net"));
189+ new sun.security.action.LoadLibraryAction("javanet"));
190 init0();
191
192 // start the address listener thread
193--- openjdk/jdk/src/windows/classes/sun/net/PortConfig.java 2015-01-08 21:19:49.000000000 +0100
194+++ openjdk/jdk/src/windows/classes/sun/net/PortConfig.java 2015-04-02 13:45:19.330199119 +0200
195@@ -43,7 +43,7 @@
196 AccessController.doPrivileged(
197 new java.security.PrivilegedAction<Void>() {
198 public Void run() {
199- System.loadLibrary("net");
200+ System.loadLibrary("javanet");
201 return null;
202 }
203 });
204--- openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java 2015-01-08 21:19:49.000000000 +0100
205+++ openjdk/jdk/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java 2015-04-02 13:47:48.245530982 +0200
206@@ -74,7 +74,7 @@
207 @Override
208 public Void run() {
209 // nio.dll has dependency on net.dll
210- System.loadLibrary("net");
211+ System.loadLibrary("javanet");
212 System.loadLibrary("nio");
213 return null;
214 }});
215--- openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2015-01-08 21:19:49.000000000 +0100
216+++ openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2015-04-02 13:48:46.363509265 +0200
217@@ -1124,7 +1124,7 @@
218 AccessController.doPrivileged(new PrivilegedAction<Void>() {
219 public Void run() {
220 // nio.dll has dependency on net.dll
221- System.loadLibrary("net");
222+ System.loadLibrary("javanet");
223 System.loadLibrary("nio");
224 return null;
225 }});
226--- openjdk/jdk/src/solaris/classes/sun/net/PortConfig.java 2015-01-08 21:19:49.000000000 +0100
227+++ openjdk/jdk/src/solaris/classes/sun/net/PortConfig.java 2015-04-02 13:49:49.541999538 +0200
228@@ -44,7 +44,7 @@
229 AccessController.doPrivileged(
230 new java.security.PrivilegedAction<Void>() {
231 public Void run() {
232- System.loadLibrary("net");
233+ System.loadLibrary("javanet");
234 String os = System.getProperty("os.name");
235 if (os.startsWith("Linux")) {
236 defaultLower = 32768;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 21:08:13 +0000