Date: Sat, 29 Aug 2020 02:25:38 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r546867 - branches/2020Q3/games/megaglest/files Message-ID: <202008290225.07T2PcHn032288@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sat Aug 29 02:25:38 2020 New Revision: 546867 URL: https://svnweb.freebsd.org/changeset/ports/546867 Log: MFH: r546865 games/megaglest: fix build with LLVM 11 The fallout here is due to the new -fno-common default in GCC 10 / LLVM 11. PR: 248870 Obtained from: https://github.com/MegaGlest/megaglest-source/issues/197 Approved by: ports-secteam (-fno-common build fix) Added: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h - copied unchanged from r546865, head/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c - copied unchanged from r546865, head/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c Modified: Directory Properties: branches/2020Q3/ (props changed) Copied: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h (from r546865, head/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h Sat Aug 29 02:25:38 2020 (r546867, copy of r546865, head/games/megaglest/files/patch-source_shared__lib_include_feathery__ftp_ftpTypes.h) @@ -0,0 +1,28 @@ +--- source/shared_lib/include/feathery_ftp/ftpTypes.h.orig 2020-08-25 07:39:46 UTC ++++ source/shared_lib/include/feathery_ftp/ftpTypes.h +@@ -69,7 +69,7 @@ typedef uint16_t port_t; + extern "C" { + #endif + +-int VERBOSE_MODE_ENABLED; ++extern int VERBOSE_MODE_ENABLED; + + typedef ip_t (*ftpFindExternalFTPServerIpType)(ip_t clientIp); + typedef void (*ftpAddUPNPPortForwardType)(int internalPort, int externalPort); +@@ -77,11 +77,11 @@ typedef void (*ftpRemoveUPNPPortForwardType)(int inter + typedef int (*ftpIsValidClientType)(ip_t clientIp); + typedef int (*ftpIsClientAllowedToGetFileType)(ip_t clientIp, const char *username, const char *filename); + +-ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; +-ftpAddUPNPPortForwardType ftpAddUPNPPortForward; +-ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; +-ftpIsValidClientType ftpIsValidClient; +-ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; ++extern ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++extern ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++extern ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++extern ftpIsValidClientType ftpIsValidClient; ++extern ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + #ifdef __cplusplus + } Copied: branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c (from r546865, head/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c Sat Aug 29 02:25:38 2020 (r546867, copy of r546865, head/games/megaglest/files/patch-source_shared__lib_sources_feathery__ftp_ftpRuntime.c) @@ -0,0 +1,16 @@ +--- source/shared_lib/sources/feathery_ftp/ftpRuntime.c.orig 2020-08-25 07:57:08 UTC ++++ source/shared_lib/sources/feathery_ftp/ftpRuntime.c +@@ -30,6 +30,13 @@ + #include "ftp.h" + #include "ftpMessages.h" + ++int VERBOSE_MODE_ENABLED; ++ ++ftpFindExternalFTPServerIpType ftpFindExternalFTPServerIp; ++ftpAddUPNPPortForwardType ftpAddUPNPPortForward; ++ftpRemoveUPNPPortForwardType ftpRemoveUPNPPortForward; ++ftpIsValidClientType ftpIsValidClient; ++ftpIsClientAllowedToGetFileType ftpIsClientAllowedToGetFile; + + /** + * @brief server-sockets that listens for incoming connections
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008290225.07T2PcHn032288>