sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix regression introduced in r372338, i.e., mis-merged fix for JDK-8031581.

Browse source 
PR:		205192
This commit is contained in:
Jung-uk Kim 2015-12-10 18:43:51 +00:00
parent dfb55550a2
commit af65c31a00
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=403464
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/openjdk8/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \

23
java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c Normal file
View file

@ -0,0 +1,23 @@
--- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig 2015-12-10 18:40:39 UTC
+++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
@@ -435,11 +435,6 @@ Java_sun_management_OperatingSystemImpl_
}
-#ifdef _ALLBSD_SOURCE
-#define FD_DIR "/dev/fd"
-#else
-#define FD_DIR "/proc/self/fd"
-#endif
JNIEXPORT jlong JNICALL
Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount
@@ -500,6 +495,8 @@ Java_sun_management_OperatingSystemImpl_
#define FD_DIR aix_fd_dir
char aix_fd_dir[32]; /* the pid has at most 19 digits */
snprintf(aix_fd_dir, 32, "/proc/%d/fd", getpid());
+#elif defined(_ALLBSD_SOURCE)
+#define FD_DIR "/dev/fd"
#else
#define FD_DIR "/proc/self/fd"
#endif