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

2 files changed, 21 insertions, 0 deletions

diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c
new file mode 100644
index 000000000000..1fb1f50b330c
--- /dev/null
+++ b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.c
@@ -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)
diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h
new file mode 100644
index 000000000000..d65624d8a234
--- /dev/null
+++ b/java/openjdk7/files/patch-jdk_src_solaris_native_java_lang_childproc.h
@@ -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);