Add PREFIX/lib to the default java.library.path. Noticed, testing and

okay by ian@
This commit is contained in:
kurt 2005-08-09 04:38:01 +00:00
parent 684c93f293
commit afc1343d11
2 changed files with 22 additions and 12 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2005/06/03 20:36:07 kurt Exp $
# $OpenBSD: Makefile,v 1.4 2005/08/09 04:38:01 kurt Exp $
ONLY_FOR_ARCHS= i386
@ -6,8 +6,8 @@ COMMENT= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.5.0
DISTNAME= jdk-1_5_0
PKGNAME= jdk-${V}p0
PKGNAME-jre= jre-${V}p0
PKGNAME= jdk-${V}p1
PKGNAME-jre= jre-${V}p1
CATEGORIES= devel/jdk java

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Feb 22 17:29:06 2005
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Tue Feb 22 17:32:45 2005
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.2 2005/08/09 04:38:01 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Mon Aug 8 16:44:36 2005
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Mon Aug 8 16:58:29 2005
@@ -35,7 +35,7 @@
# include <semaphore.h>
# include <unistd.h>
@ -51,7 +51,17 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 k
fatal("Unable to get current thread stack base size");
}
@@ -844,9 +857,12 @@ err:
@@ -416,7 +429,9 @@ void os::init_system_properties_values()
#define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n))
#define getenv(n) ::getenv(n)
+#ifndef DEFAULT_LD_LIBRARY_PATH
#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */
+#endif
#define EXTENSIONS_DIR "/lib/ext"
#define ENDORSED_DIR "/lib/endorsed"
@@ -844,9 +859,12 @@ err:
// Set the default thread priority otherwise use NormalPriority
if ( UseThreadPriorities ) {
@ -64,7 +74,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 k
}
// Initial thread state is INITIALIZED, not SUSPENDED
@@ -1438,7 +1454,7 @@ bool _print_ascii_file(const char* filen
@@ -1438,7 +1456,7 @@ bool _print_ascii_file(const char* filen
void os::print_os_info(outputStream* st) {
st->print("OS:");
@ -73,7 +83,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 k
// kernel
st->print("uname:");
@@ -1895,10 +1911,10 @@ static int os_sleep(jlong millis, bool i
@@ -1895,10 +1913,10 @@ static int os_sleep(jlong millis, bool i
if (!interruptible) {
do {
res = nanosleep(&t, &t);
@ -86,7 +96,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 k
}
// INTERRUPTIBLE_NORESTART_VM returns res == OS_INTRPT for thread.Interrupt
@@ -2078,9 +2094,14 @@ int os::java_to_os_priority[MaxPriority
@@ -2078,9 +2096,14 @@ int os::java_to_os_priority[MaxPriority
OSReturn os::set_native_priority(Thread* thread, int newpri) {
assert(newpri >= MinimumPriority && newpri <= MaximumPriority, "bad priority mapping");
@ -101,7 +111,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 k
}
@@ -2485,6 +2506,18 @@ void os::Bsd::install_signal_handlers()
@@ -2485,6 +2508,18 @@ void os::Bsd::install_signal_handlers()
void report_error(const char* file_name, int line_no, const char* title, const char* format, ...);
@ -120,7 +130,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.1.1.1 2005/05/25 17:27:53 k
// XXXBSD: fix names (order)
const char * signames[] = {
"SIG0",
@@ -2497,6 +2530,7 @@ const char * signames[] = {
@@ -2497,6 +2532,7 @@ const char * signames[] = {
"SIGXFSZ", "SIGWAITING", "SIGLWP", "SIGFREEZE", "SIGTHAW",
"SIGCANCEL", "SIGLOST"
};