svn commit: r552072 - head/java/openjdk7/files

[Greg Lewis]

Author: glewis
Date: Sun Oct 11 17:00:06 2020
New Revision: 552072
URL: https://svnweb.freebsd.org/changeset/ports/552072

Log:
  Remove duplicate symbols to try and fix the build on -CURRENT

Added:
  head/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c   (contents, props changed)
  head/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h   (contents, props changed)

Added: head/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c	Sun Oct 11 17:00:06 2020	(r552072)
@@ -0,0 +1,10 @@
+--- jdk/src/solaris/native/java/lang/childproc.c
++++ jdk/src/solaris/native/java/lang/childproc.c
+@@ -33,6 +33,7 @@
+ 
+ #include "childproc.h"
+ 
++const char * const *parentPathv;
+ 
+ ssize_t
+ restartableWrite(int fd, const void *buf, size_t count)

Added: head/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h	Sun Oct 11 17:00:06 2020	(r552072)
@@ -0,0 +1,11 @@
+--- jdk/src/solaris/native/java/lang/childproc.h
++++ jdk/src/solaris/native/java/lang/childproc.h
+@@ -119,7 +119,7 @@ typedef struct _SpawnInfo {
+  * The cached and split version of the JDK's effective PATH.
+  * (We don't support putenv("PATH=...") in native code)
+  */
+-const char * const *parentPathv;
++extern const char * const *parentPathv;
+ 
+ ssize_t restartableWrite(int fd, const void *buf, size_t count);
+ int restartableDup2(int fd_from, int fd_to);