diff options
author | tnn <tnn@pkgsrc.org> | 2015-02-10 14:57:35 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2015-02-10 14:57:35 +0000 |
commit | 326ea0169291c36e8bfb0e3dd0716eaf54253fd6 (patch) | |
tree | fa0270c4f2f8ba4ed09addda25f322f2cbbbef65 /lang/openjdk7/patches | |
parent | c65a3832af58ee5ae4a427a63f0c07e23260ef03 (diff) | |
download | pkgsrc-326ea0169291c36e8bfb0e3dd0716eaf54253fd6.tar.gz |
Fix error observed in SmartOS bulk build.
Note: PLIST.SunOS should list only files unique to SunOS, not duplicates.
XXX why does it bundle libfreetype.so.6? looks wrong.
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp new file mode 100644 index 00000000000..ba23bb2ab62 --- /dev/null +++ b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp,v 1.1 2015/02/10 14:57:35 tnn Exp $ + +dirent->dd_fd is legacy, dirent->d_fd is POSIX, dirfd(dirent) is better. + +--- hotspot/src/os/solaris/vm/perfMemory_solaris.cpp.orig 2015-01-26 15:21:44.000000000 +0000 ++++ hotspot/src/os/solaris/vm/perfMemory_solaris.cpp +@@ -334,7 +334,7 @@ static DIR *open_directory_secure(const + } + + // Check to make sure fd and dirp are referencing the same file system object. +- if (!is_same_fsobject(fd, dirp->dd_fd)) { ++ if (!is_same_fsobject(fd, dirfd(dirp))) { + // The directory is not secure. + os::close(fd); + os::closedir(dirp); +@@ -366,7 +366,7 @@ static DIR *open_directory_secure_cwd(co + // Directory doesn't exist or is insecure, so there is nothing to cleanup. + return dirp; + } +- int fd = dirp->dd_fd; ++ int fd = dirfd(dirp); + + // Open a fd to the cwd and save it off. + int result; |