This is just a repost of the patches scheme provided in April for
getting bsd-port working on Linux. Maybe we should put them up on the
wiki somewhere...
-Frank
fix machine/endian.h
diff --git a/src/share/native/java/lang/fdlibm/include/fdlibm.h b/src/share/native/java/lang/fdlibm/include/fdlibm.h
--- a/src/share/native/java/lang/fdlibm/include/fdlibm.h
+++ b/src/share/native/java/lang/fdlibm/include/fdlibm.h
@@ -27,7 +27,7 @@
#ifdef __OpenBSD__
#include <sys/types.h>
#endif
-#include <machine/endian.h>
+#include <endian.h>
#include "jfdlibm.h"
#ifdef __NEWVALID /* special setup for Sun test regime */
diff --git a/src/share/native/sun/awt/medialib/mlib_image.h b/src/share/native/sun/awt/medialib/mlib_image.h
--- a/src/share/native/sun/awt/medialib/mlib_image.h
+++ b/src/share/native/sun/awt/medialib/mlib_image.h
@@ -30,7 +30,7 @@
#ifdef __OpenBSD__
#include <sys/types.h>
#endif
-#include <machine/endian.h>
+#include <endian.h>
#include <mlib_types.h>
#include <mlib_status.h>
diff --git a/src/solaris/back/util_md.h b/src/solaris/back/util_md.h
--- a/src/solaris/back/util_md.h
+++ b/src/solaris/back/util_md.h
@@ -31,7 +31,7 @@
#include <limits.h>
#include <sys/types.h>
-#include <machine/endian.h>
+#include <endian.h>
#ifdef _LP64
typedef unsigned long UNSIGNED_JLONG;
diff --git a/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c b/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
--- a/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
+++ b/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
@@ -66,7 +66,7 @@
#ifdef __OpenBSD__
#include <sys/types.h>
#endif
-#include <machine/endian.h>
+#include <endian.h>
#include <mlib_image.h>
#include <mlib_ImageZoom.h>
fix sun.tools.jar
diff --git a/src/share/classes/sun/tools/jar/Main.java b/src/share/classes/sun/tools/jar/Main.java
--- a/src/share/classes/sun/tools/jar/Main.java
+++ b/src/share/classes/sun/tools/jar/Main.java
@@ -241,6 +241,16 @@
}
} else if (xflag) {
replaceFSC(files);
+ // Current working directory
+ cwd = System.getProperty("user.dir");
+ if (cwd == null) {
+ fatalError(getMsg("error.no.cwd"));
+ }
+ cwd = (new File(cwd)).getCanonicalPath();
+ if (!cwd.endsWith(File.separator)) {
+ cwd += File.separator;
+ }
+
if (fname != null && files != null) {
extract(fname, files);
} else {
@@ -802,17 +812,6 @@
* Extracts specified entries from JAR file.
*/
void extract(InputStream in, String files[]) throws IOException {
- // Current working directory
-
- cwd = System.getProperty("user.dir");
- if (cwd == null) {
- fatalError(getMsg("error.no.cwd"));
- }
- cwd = (new File(cwd)).getCanonicalPath();
- if (!cwd.endsWith(File.separator)) {
- cwd += File.separator;
- }
-
// Extract the files
ZipInputStream zis = new ZipInputStream(in);
fix jmx.snmp binaryplugs
diff --git a/make/common/internal/BinaryPlugs.gmk b/make/common/internal/BinaryPlugs.gmk
--- a/make/common/internal/BinaryPlugs.gmk
+++ b/make/common/internal/BinaryPlugs.gmk
@@ -58,6 +58,12 @@
com/sun/jmx/snmp/SnmpTimeticks.class \
com/sun/jmx/snmp/SnmpVarBind.class \
com/sun/jmx/snmp/SnmpVarBindList.class \
+com/sun/jmx/snmp/Timestamp.class \
+com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
+com/sun/jmx/snmp/daemon/SnmpSocket.class \
+com/sun/jmx/snmp/daemon/SnmpQManager.class \
+com/sun/jmx/snmp/daemon/WaitQ.class \
+com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
com/sun/jmx/snmp/daemon/SendQ.class \
com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
com/sun/jmx/snmp/daemon/SnmpSession.class
_______________________________________________
mlvm-dev mailing list
[email protected]
http://mail.openjdk.java.net/mailman/listinfo/mlvm-dev
