Changeset 58660 in vbox

Timestamp:

Nov 11, 2015 12:36:35 PM (9 years ago)

Author:

vboxsync

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

104077

Message:

bugref:8087: Additions/x11: support non-root X server: when we build our OpenGL library the standard way (not hijacking Mesa) we have problems with SELinux on Fedora due to our assembly stubs which require text relocations. We have code to do this with C or assembly, and I do not know any reason why assembly is better, so switch to C until I do.

File:

• trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk (modified) (3 diffs)

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

@@ -162 +162 @@
  else
   VBoxOGL_SOURCES.linux += \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
   VBoxOGL_SOURCES.solaris += \
         $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
@@ -181 +181 @@
         $(VBOX_PATH_CROGL_GENFILES)/tsfuncs.c
 VBoxOGL_CLEAN.linux        += \
-        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm
+        $(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
 VBoxOGL_CLEAN.solaris        += \
         $(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
@@ -333 +333 @@
 
   else
-$(VBOX_PATH_CROGL_GENFILES)/linux_exports.asm: \
-                $(PATH_SUB_CURRENT)/Linux_i386_exports.py \
+$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c: \
+                $(PATH_SUB_CURRENT)/Linux_exports.py \
                 $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
                 | $$(dir $$@)