diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2020-10-14 16:07:57 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2020-10-14 16:07:57 +0000 |
| commit | ffc0a5d481d71de806eb5a60c96819425152ed91 (patch) | |
| tree | 87d0a004e48a9b8098b234ed6e863c58586049a6 /java/openjdk7 | |
| parent | 27fde5e7edcc493662b2ec72d947114aeb3e554a (diff) | |
| download | ports-ffc0a5d481d71de806eb5a60c96819425152ed91.tar.gz ports-ffc0a5d481d71de806eb5a60c96819425152ed91.zip | |
More duplicate symbol removal to try to fix the build on -CURRENT
Notes
Notes:
svn path=/head/; revision=552341
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c | 12 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c new file mode 100644 index 000000000000..be20c35c9d79 --- /dev/null +++ b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c @@ -0,0 +1,12 @@ +--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.orig 2020-10-13 23:04:42.602966000 -0700 ++++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2020-10-13 23:05:10.165713000 -0700 +@@ -28,6 +28,9 @@ + #include <dlfcn.h> + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; diff --git a/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h new file mode 100644 index 000000000000..0e49a7a35502 --- /dev/null +++ b/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h @@ -0,0 +1,10 @@ +--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.orig 2020-10-13 23:03:46.002701000 -0700 ++++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h 2020-10-13 23:04:24.830082000 -0700 +@@ -265,6 +265,6 @@ + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif |