Squash-merge bugfix/linux-std-io

multitheftauto · Jul 28, 2017 · 1910304 · 1910304
1 parent 9f62d13
commit 1910304
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/Server/core/CDynamicLibrary.cpp b/Server/core/CDynamicLibrary.cpp
@@ -86,7 +86,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
             LocalFree ( lpMsgBuf );
         }
     #else
-        m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
+        m_hModule = dlopen ( szFilename, RTLD_NOW );
 
         // Output error if needed
         if ( !m_hModule )

diff --git a/Server/core/premake5.lua b/Server/core/premake5.lua
@@ -47,6 +47,6 @@ project "Core"
 		links { "ncursesw", "breakpad", "rt" }
 		buildoptions { "-pthread" }
 		linkoptions { "-pthread" }
-
+	
 	filter "platforms:x64"
 		targetdir(buildpath("server/x64"))
diff --git a/Server/launcher/CDynamicLibrary.cpp b/Server/launcher/CDynamicLibrary.cpp
@@ -39,7 +39,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
     #ifdef WIN32
         m_hModule = LoadLibrary ( szFilename );
     #else
-        m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
+        m_hModule = dlopen ( szFilename, RTLD_NOW );
 
     // Output error if needed
     if ( !m_hModule )

diff --git a/Server/launcher/premake5.lua b/Server/launcher/premake5.lua
@@ -28,8 +28,8 @@ project "Launcher"
 
 	filter "system:linux"
 		links { "dl" }
-		buildoptions { "-pthread" }
-		linkoptions { "-pthread" }
+		buildoptions { "-pthread", "-fvisibility=default" }
+		linkoptions { "-pthread", "-rdynamic" }
 
 	filter {"system:linux", "platforms:x86"}
 		targetname "mta-server"

diff --git a/Server/mods/deathmatch/logic/CDynamicLibrary.cpp b/Server/mods/deathmatch/logic/CDynamicLibrary.cpp
@@ -46,7 +46,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
         }
 
     #else
-        m_hModule = dlopen ( szFilename, RTLD_NOW | RTLD_DEEPBIND );
+        m_hModule = dlopen ( szFilename, RTLD_NOW );
 
         // Output error if needed
         if ( !m_hModule )

diff --git a/Server/mods/deathmatch/logic/lua/CLuaModule.cpp b/Server/mods/deathmatch/logic/lua/CLuaModule.cpp
@@ -79,7 +79,7 @@ int CLuaModule::_LoadModule ( void )
         strError = SString( "%d", GetLastError() );
     SetCurrentDirectory( strSavedCurrentDirectory );
 #else
-    m_hModule = dlopen ( m_szFileName, RTLD_NOW | RTLD_DEEPBIND );
+    m_hModule = dlopen ( m_szFileName, RTLD_NOW );
     if ( m_hModule == NULL )
         strError = dlerror();
 #endif

diff --git a/Shared/publicsdk/Common.h b/Shared/publicsdk/Common.h
@@ -26,7 +26,7 @@ extern "C"
 #ifdef WIN32
     #define MTAEXPORT extern "C" __declspec(dllexport)
 #else
-    #define MTAEXPORT extern "C"
+    #define MTAEXPORT extern "C" __attribute__ ((visibility ("default")))
 #endif
 
 #include <list>

diff --git a/Shared/sdk/Common.h b/Shared/sdk/Common.h
@@ -79,7 +79,7 @@ struct ElementID
 #ifdef WIN32
 #define _DECLSPEC_EX extern "C" _declspec(dllexport) 
 #else
-#define _DECLSPEC_EX extern "C" 
+#define _DECLSPEC_EX extern "C" __attribute__ ((visibility ("default")))
 #endif
 
 // Maximum number of players that can be packed in a single lightweight puresync packet

diff --git a/premake5.lua b/premake5.lua
@@ -100,6 +100,7 @@ workspace "MTASA"
 
 	filter "system:linux"
 		vectorextensions "SSE2"
+		buildoptions { "-fvisibility=hidden" }
 
 	-- Only build the client on Windows
 	if os.target() == "windows" then

diff --git a/utils/docker-entrypoint.sh b/utils/docker-entrypoint.sh
@@ -9,7 +9,7 @@ fi
 
 # 32-bits
 if [ ! -d /compat/x86 ] && [[ $BUILD_BITS = "32" ]]; then
-    apt-get install -y libmysqlclient-dev:i386
+    apt-get update && apt-get install -y libmysqlclient-dev:i386
     mkdir -p /compat/x86
     objcopy --redefine-syms=/compat/glibc_version_x86.redef /usr/lib/gcc/x86_64-linux-gnu/5/32/libstdc++.a /compat/x86/libstdc++.a
     objcopy --redefine-syms=/compat/glibc_version_x86.redef /usr/lib/i386-linux-gnu/libmysqlclient.a /compat/x86/libmysqlclient.a