Changeset 59165 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2015 7:31:17 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: revert r104007, r104003 and r104001: make the VBoxOGL.so replacement OpenGL library executable. We no longer need this now that VBoxClient --check3d does the same test for whether 3D is supported in the virtual machine.

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• load.c (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -227 +227 @@
         dl
   endif
- else
-  VBoxOGL_SONAME.linux = libGL.so.1
-  VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
  endif
 endif

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -1126 +1126 @@
 /* Sigh -- we can't do initialization at load time, since Windows forbids
  * the loading of other libraries from DLLMain. */
-
-/** @note On Linux we make our shared library executable as a quick way of
- * testing whether a particular guest supports 3D in the current configuration.
- * If 3D is not enabled, the constructor will exit with status 1.  If the
- * library cannot be loaded at all (e.g. missing dependencies) executing it will
- * also fail. */
-#ifdef RT_OS_LINUX
-# ifdef RT_ARCH_AMD64
-const char pszInterpreter[] __attribute__((section(".interp"))) = "/lib64/ld-linux-x86-64.so.2";
-# else
-const char pszInterpreter[] __attribute__((section(".interp"))) = "/lib/ld-linux.so.2";
-# endif
-
-extern void LibMain()
-{
-   if (!stubInit())
-       _exit(1);
-   _exit(0);
-}
-#endif
 
 #ifdef WINDOWS