Changeset 69981 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 7, 2017 2:20:34 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

119487

Message:

Additions/common/OpenGL: do not statically link the guest library twice.
bugref:9060: vboxvideo: hanging login screen starting Ubuntu 17.10 guest with 3D
r117617/public r68472 and the follow-up switched the Linux Additions 3D code
over to use the VBoxGuest HGCM APIs. Since the Guest Library code was
statically linked twice in the process space of libGL users a global symbol
ended up not being unique. This change removes one of the static copies.

File:

• trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (1 diff)

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

@@ -204 +204 @@
  endif
 endif
+# VBoxOGL_LIBS = \  # VBOX_LIB_OGL_CRUTIL includes these and caused an interesting conflict.
+#       $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
+#       $(VBOX_LIB_VBGL_R3_SHARED) \
+
 VBoxOGL_LIBS = \
-        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
-        $(VBOX_LIB_VBGL_R3_SHARED) \
         $(VBOX_LIB_OGL_CRUTIL) \
         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)