cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- work-around libpthread limitations in javaForkAndExec() by adjusting the

Browse Source 
child process to not set file descriptors back to blocking when closing
  them. This fixes the netbeans build failure since a libpthread fix is not
  evident.
- update the North America time zone file to account for the tz changes
  (from ian@)
- use X11BASE
- SHARED_ONLY=Yes
This commit is contained in:
kurt 2007-04-13 00:29:48 +00:00
parent 44b755c60a
commit 3cb2b7ac3b
7 changed files with 1962 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/jdk/1.5/Makefile
View File

@ -1,5 +1,6 @@
# $OpenBSD: Makefile,v 1.35 2007/04/08 12:43:06 kurt Exp $
# $OpenBSD: Makefile,v 1.36 2007/04/13 00:29:48 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}"
@ -7,8 +8,8 @@ COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.5.0
DISTNAME= jdk-1_5_0
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}p29
PKGNAME-jre= jre-${V}p29
PKGNAME-main= jdk-${V}p30
PKGNAME-jre= jre-${V}p30
CATEGORIES= devel/jdk java
@ -55,7 +56,7 @@ MAKE_ENV= ALT_MOTIF_DIR="${LOCALBASE}" \
LANG="C" \
CC="${CC}" \
CXX="${CXX}" \
DEFAULT_LD_LIBRARY_PATH="/usr/lib:/usr/X11R6/lib:${LOCALBASE}/lib" \
DEFAULT_LD_LIBRARY_PATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \
HOTSPOT_BUILD_JOBS=`sysctl -n hw.ncpu`
# Error message for distfile.

1858
devel/jdk/1.5/patches/patch-j2se_make_sun_javazic_tzdata_northamerica Normal file
View File

File diff suppressed because it is too large Load Diff

55
devel/jdk/1.5/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c Normal file
View File

@ -0,0 +1,55 @@
$OpenBSD: patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c,v 1.3 2007/04/13 00:29:48 kurt Exp $
--- j2se/src/solaris/native/java/lang/UNIXProcess_md.c.orig Thu Apr 12 06:28:13 2007
+++ j2se/src/solaris/native/java/lang/UNIXProcess_md.c Thu Apr 12 06:34:01 2007
@@ -304,14 +304,18 @@ Java_java_lang_UNIXProcess_waitForProcessExit(JNIEnv*
#if defined(__OpenBSD__)
/*
- * On OpenBSD closefrom will close only the opened fds without
- * having to use heuristics and is safe to use when single
- * threaded.
+ * Directly call _thread_sys_closefrom() so the child process
+ * doesn't reset the parrent's file descriptors to be blocking.
+ * This function is only called from the child process which
+ * is single threaded and about to call execvp() so it is
+ * safe to bypass the threaded closefrom().
*/
+int _thread_sys_closefrom(int);
+
static int
closeDescriptors(void)
{
- return closefrom(3);
+ return _thread_sys_closefrom(3);
}
#else
@@ -559,6 +563,28 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
if (resultPid == 0) {
/* Child process */
+
+#ifdef __OpenBSD__
+// XXXBSD: Work-around userland pthread implementation issue.
+// Closing file descriptors will reset them to be blocking.
+// This is problematic for the parent when it attemts to use
+// the blocking fd and deadlocks. Setting them to non-blocking
+// in the child prevents the close/dup2 from resetting them.
+ {
+ int flags;
+ flags = fcntl(STDIN_FILENO, F_GETFL, NULL);
+ if (flags != -1)
+ fcntl(STDIN_FILENO, F_SETFL, flags | O_NONBLOCK);
+
+ flags = fcntl(STDOUT_FILENO, F_GETFL, NULL);
+ if (flags != -1)
+ fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK);
+
+ flags = fcntl(STDERR_FILENO, F_GETFL, NULL);
+ if (flags != -1)
+ fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK);
+ }
+#endif
/* Close the parent sides of the pipe.
Give the child sides of the pipes the right fileno's.

7
devel/jdk/1.5/pkg/PFRAG.no-no_web-jre
View File

@ -1,9 +1,13 @@
@comment $OpenBSD: PFRAG.no-no_web-jre,v 1.3 2007/04/13 00:29:48 kurt Exp $
${JREHOME}/bin/ControlPanel
${JREHOME}/bin/java_vm
${JREHOME}/bin/javaws
${JREHOME}/javaws/
${JREHOME}/javaws/javaws
${JREHOME}/lib/deploy.jar
${JREHOME}/lib/${MACHINE_ARCH}/libdeploy.so
${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
${JREHOME}/lib/images/icons/
${JREHOME}/lib/images/icons/sun-java.png
${JREHOME}/lib/images/icons/sun-java_HighContrast.png
@ -73,7 +77,4 @@ ${JREHOME}/plugin/desktop/sun_java.desktop
${JREHOME}/plugin/desktop/sun_java.png
${JREHOME}/plugin/${MACHINE_ARCH}/
${JREHOME}/plugin/${MACHINE_ARCH}/ns7/
${JREHOME}/lib/${MACHINE_ARCH}/libdeploy.so
${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
${JREHOME}/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so

12
devel/jdk/1.5/pkg/PFRAG.no-no_web-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_web-main,v 1.2 2007/02/01 21:00:52 kurt Exp $
@comment $OpenBSD: PFRAG.no-no_web-main,v 1.3 2007/04/13 00:29:49 kurt Exp $
${JDKHOME}/bin/ControlPanel
${JDKHOME}/bin/HtmlConverter
${JDKHOME}/bin/javaws
@ -523,14 +523,14 @@ ${JDKHOME}/jre/bin/javaws
${JDKHOME}/jre/bin/javaws_g
${JDKHOME}/jre/javaws/
${JDKHOME}/jre/javaws/javaws
${JDKHOME}/jre/lib/deploy.jar
${JDKHOME}/jre/lib/deploy_g.jar
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy_g.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_jni_g.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_nscp_g.so
${JDKHOME}/jre/lib/deploy.jar
${JDKHOME}/jre/lib/deploy_g.jar
${JDKHOME}/jre/lib/images/icons/
${JDKHOME}/jre/lib/images/icons/sun-java.png
${JDKHOME}/jre/lib/images/icons/sun-java_HighContrast.png
@ -596,13 +596,13 @@ ${JDKHOME}/jre/lib/plugin.jar
${JDKHOME}/jre/lib/plugin_g.jar
${JDKHOME}/jre/lib/security/javaws.policy
${JDKHOME}/jre/plugin/
${JDKHOME}/jre/plugin/desktop/
${JDKHOME}/jre/plugin/desktop/sun_java.desktop
${JDKHOME}/jre/plugin/desktop/sun_java.png
${JDKHOME}/jre/plugin/${MACHINE_ARCH}/
${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/
${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so
${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji_g.so
${JDKHOME}/jre/plugin/desktop/
${JDKHOME}/jre/plugin/desktop/sun_java.desktop
${JDKHOME}/jre/plugin/desktop/sun_java.png
${JDKHOME}/lib/htmlconverter.jar
${JDKHOME}/lib/htmlconverter_g.jar
@man ${JDKHOME}/man/man1/javaws.1

20
devel/jdk/1.5/pkg/PLIST-jre
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-jre,v 1.8 2007/02/01 21:00:52 kurt Exp $
@comment $OpenBSD: PLIST-jre,v 1.9 2007/04/13 00:29:49 kurt Exp $
@option no-default-conflict
@conflict jre->=1.5,<1.6
@pkgpath devel/jdk/1.5,-jre,native_bootstrap
@ -195,10 +195,12 @@ ${JREHOME}/lib/zi/America/Antigua
${JREHOME}/lib/zi/America/Araguaina
${JREHOME}/lib/zi/America/Aruba
${JREHOME}/lib/zi/America/Asuncion
${JREHOME}/lib/zi/America/Atikokan
${JREHOME}/lib/zi/America/Bahia
${JREHOME}/lib/zi/America/Barbados
${JREHOME}/lib/zi/America/Belem
${JREHOME}/lib/zi/America/Belize
${JREHOME}/lib/zi/America/Blanc-Sablon
${JREHOME}/lib/zi/America/Boa_Vista
${JREHOME}/lib/zi/America/Bogota
${JREHOME}/lib/zi/America/Boise
@ -239,21 +241,24 @@ ${JREHOME}/lib/zi/America/Halifax
${JREHOME}/lib/zi/America/Havana
${JREHOME}/lib/zi/America/Hermosillo
${JREHOME}/lib/zi/America/Indiana/
${JREHOME}/lib/zi/America/Indiana/Indianapolis
${JREHOME}/lib/zi/America/Indiana/Knox
${JREHOME}/lib/zi/America/Indiana/Marengo
${JREHOME}/lib/zi/America/Indiana/Petersburg
${JREHOME}/lib/zi/America/Indiana/Vevay
${JREHOME}/lib/zi/America/Indianapolis
${JREHOME}/lib/zi/America/Indiana/Vincennes
${JREHOME}/lib/zi/America/Indiana/Winamac
${JREHOME}/lib/zi/America/Inuvik
${JREHOME}/lib/zi/America/Iqaluit
${JREHOME}/lib/zi/America/Jamaica
${JREHOME}/lib/zi/America/Jujuy
${JREHOME}/lib/zi/America/Juneau
${JREHOME}/lib/zi/America/Kentucky/
${JREHOME}/lib/zi/America/Kentucky/Louisville
${JREHOME}/lib/zi/America/Kentucky/Monticello
${JREHOME}/lib/zi/America/La_Paz
${JREHOME}/lib/zi/America/Lima
${JREHOME}/lib/zi/America/Los_Angeles
${JREHOME}/lib/zi/America/Louisville
${JREHOME}/lib/zi/America/Maceio
${JREHOME}/lib/zi/America/Managua
${JREHOME}/lib/zi/America/Manaus
@ -264,6 +269,7 @@ ${JREHOME}/lib/zi/America/Menominee
${JREHOME}/lib/zi/America/Merida
${JREHOME}/lib/zi/America/Mexico_City
${JREHOME}/lib/zi/America/Miquelon
${JREHOME}/lib/zi/America/Moncton
${JREHOME}/lib/zi/America/Monterrey
${JREHOME}/lib/zi/America/Montevideo
${JREHOME}/lib/zi/America/Montreal
@ -275,6 +281,7 @@ ${JREHOME}/lib/zi/America/Nome
${JREHOME}/lib/zi/America/Noronha
${JREHOME}/lib/zi/America/North_Dakota/
${JREHOME}/lib/zi/America/North_Dakota/Center
${JREHOME}/lib/zi/America/North_Dakota/New_Salem
${JREHOME}/lib/zi/America/Panama
${JREHOME}/lib/zi/America/Pangnirtung
${JREHOME}/lib/zi/America/Paramaribo
@ -421,7 +428,10 @@ ${JREHOME}/lib/zi/Australia/Melbourne
${JREHOME}/lib/zi/Australia/Perth
${JREHOME}/lib/zi/Australia/Sydney
${JREHOME}/lib/zi/CET
${JREHOME}/lib/zi/CST6CDT
${JREHOME}/lib/zi/EET
${JREHOME}/lib/zi/EST
${JREHOME}/lib/zi/EST5EDT
${JREHOME}/lib/zi/Etc/
${JREHOME}/lib/zi/Etc/GMT
${JREHOME}/lib/zi/Etc/GMT+1
@ -497,6 +507,7 @@ ${JREHOME}/lib/zi/Europe/Warsaw
${JREHOME}/lib/zi/Europe/Zaporozhye
${JREHOME}/lib/zi/Europe/Zurich
${JREHOME}/lib/zi/GMT
${JREHOME}/lib/zi/HST
${JREHOME}/lib/zi/Indian/
${JREHOME}/lib/zi/Indian/Antananarivo
${JREHOME}/lib/zi/Indian/Chagos
@ -510,6 +521,9 @@ ${JREHOME}/lib/zi/Indian/Mauritius
${JREHOME}/lib/zi/Indian/Mayotte
${JREHOME}/lib/zi/Indian/Reunion
${JREHOME}/lib/zi/MET
${JREHOME}/lib/zi/MST
${JREHOME}/lib/zi/MST7MDT
${JREHOME}/lib/zi/PST8PDT
${JREHOME}/lib/zi/Pacific/
${JREHOME}/lib/zi/Pacific/Apia
${JREHOME}/lib/zi/Pacific/Auckland

20
devel/jdk/1.5/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2007/02/01 21:00:52 kurt Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2007/04/13 00:29:49 kurt Exp $
@option no-default-conflict
@conflict jdk->=1.5,<1.6
@pkgpath devel/jdk/1.5,native_bootstrap
@ -993,10 +993,12 @@ ${JDKHOME}/jre/lib/zi/America/Antigua
${JDKHOME}/jre/lib/zi/America/Araguaina
${JDKHOME}/jre/lib/zi/America/Aruba
${JDKHOME}/jre/lib/zi/America/Asuncion
${JDKHOME}/jre/lib/zi/America/Atikokan
${JDKHOME}/jre/lib/zi/America/Bahia
${JDKHOME}/jre/lib/zi/America/Barbados
${JDKHOME}/jre/lib/zi/America/Belem
${JDKHOME}/jre/lib/zi/America/Belize
${JDKHOME}/jre/lib/zi/America/Blanc-Sablon
${JDKHOME}/jre/lib/zi/America/Boa_Vista
${JDKHOME}/jre/lib/zi/America/Bogota
${JDKHOME}/jre/lib/zi/America/Boise
@ -1037,21 +1039,24 @@ ${JDKHOME}/jre/lib/zi/America/Halifax
${JDKHOME}/jre/lib/zi/America/Havana
${JDKHOME}/jre/lib/zi/America/Hermosillo
${JDKHOME}/jre/lib/zi/America/Indiana/
${JDKHOME}/jre/lib/zi/America/Indiana/Indianapolis
${JDKHOME}/jre/lib/zi/America/Indiana/Knox
${JDKHOME}/jre/lib/zi/America/Indiana/Marengo
${JDKHOME}/jre/lib/zi/America/Indiana/Petersburg
${JDKHOME}/jre/lib/zi/America/Indiana/Vevay
${JDKHOME}/jre/lib/zi/America/Indianapolis
${JDKHOME}/jre/lib/zi/America/Indiana/Vincennes
${JDKHOME}/jre/lib/zi/America/Indiana/Winamac
${JDKHOME}/jre/lib/zi/America/Inuvik
${JDKHOME}/jre/lib/zi/America/Iqaluit
${JDKHOME}/jre/lib/zi/America/Jamaica
${JDKHOME}/jre/lib/zi/America/Jujuy
${JDKHOME}/jre/lib/zi/America/Juneau
${JDKHOME}/jre/lib/zi/America/Kentucky/
${JDKHOME}/jre/lib/zi/America/Kentucky/Louisville
${JDKHOME}/jre/lib/zi/America/Kentucky/Monticello
${JDKHOME}/jre/lib/zi/America/La_Paz
${JDKHOME}/jre/lib/zi/America/Lima
${JDKHOME}/jre/lib/zi/America/Los_Angeles
${JDKHOME}/jre/lib/zi/America/Louisville
${JDKHOME}/jre/lib/zi/America/Maceio
${JDKHOME}/jre/lib/zi/America/Managua
${JDKHOME}/jre/lib/zi/America/Manaus
@ -1062,6 +1067,7 @@ ${JDKHOME}/jre/lib/zi/America/Menominee
${JDKHOME}/jre/lib/zi/America/Merida
${JDKHOME}/jre/lib/zi/America/Mexico_City
${JDKHOME}/jre/lib/zi/America/Miquelon
${JDKHOME}/jre/lib/zi/America/Moncton
${JDKHOME}/jre/lib/zi/America/Monterrey
${JDKHOME}/jre/lib/zi/America/Montevideo
${JDKHOME}/jre/lib/zi/America/Montreal
@ -1073,6 +1079,7 @@ ${JDKHOME}/jre/lib/zi/America/Nome
${JDKHOME}/jre/lib/zi/America/Noronha
${JDKHOME}/jre/lib/zi/America/North_Dakota/
${JDKHOME}/jre/lib/zi/America/North_Dakota/Center
${JDKHOME}/jre/lib/zi/America/North_Dakota/New_Salem
${JDKHOME}/jre/lib/zi/America/Panama
${JDKHOME}/jre/lib/zi/America/Pangnirtung
${JDKHOME}/jre/lib/zi/America/Paramaribo
@ -1219,7 +1226,10 @@ ${JDKHOME}/jre/lib/zi/Australia/Melbourne
${JDKHOME}/jre/lib/zi/Australia/Perth
${JDKHOME}/jre/lib/zi/Australia/Sydney
${JDKHOME}/jre/lib/zi/CET
${JDKHOME}/jre/lib/zi/CST6CDT
${JDKHOME}/jre/lib/zi/EET
${JDKHOME}/jre/lib/zi/EST
${JDKHOME}/jre/lib/zi/EST5EDT
${JDKHOME}/jre/lib/zi/Etc/
${JDKHOME}/jre/lib/zi/Etc/GMT
${JDKHOME}/jre/lib/zi/Etc/GMT+1
@ -1295,6 +1305,7 @@ ${JDKHOME}/jre/lib/zi/Europe/Warsaw
${JDKHOME}/jre/lib/zi/Europe/Zaporozhye
${JDKHOME}/jre/lib/zi/Europe/Zurich
${JDKHOME}/jre/lib/zi/GMT
${JDKHOME}/jre/lib/zi/HST
${JDKHOME}/jre/lib/zi/Indian/
${JDKHOME}/jre/lib/zi/Indian/Antananarivo
${JDKHOME}/jre/lib/zi/Indian/Chagos
@ -1308,6 +1319,9 @@ ${JDKHOME}/jre/lib/zi/Indian/Mauritius
${JDKHOME}/jre/lib/zi/Indian/Mayotte
${JDKHOME}/jre/lib/zi/Indian/Reunion
${JDKHOME}/jre/lib/zi/MET
${JDKHOME}/jre/lib/zi/MST
${JDKHOME}/jre/lib/zi/MST7MDT
${JDKHOME}/jre/lib/zi/PST8PDT
${JDKHOME}/jre/lib/zi/Pacific/
${JDKHOME}/jre/lib/zi/Pacific/Apia
${JDKHOME}/jre/lib/zi/Pacific/Auckland