Date: Wed, 14 Oct 2020 16:07:57 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552341 - head/java/openjdk7/files Message-ID: <202010141607.09EG7vjI058734@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Wed Oct 14 16:07:57 2020 New Revision: 552341 URL: https://svnweb.freebsd.org/changeset/ports/552341 Log: More duplicate symbol removal to try to fix the build on -CURRENT Added: head/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c (contents, props changed) head/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h (contents, props changed) Added: head/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.c Wed Oct 14 16:07:57 2020 (r552341) @@ -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"; Added: head/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-jdk_src_solaris_native_sun_security_jgss_wrapper_NativeFunc.h Wed Oct 14 16:07:57 2020 (r552341) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010141607.09EG7vjI058734>