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

Timestamp:

Dec 14, 2018 8:23:41 AM (6 years ago)

Author:

vboxsync

Message:

Additions/x11: fixes for building the X11 Additions for Linux distributions.
Contributed by Sérgio Basto under the MIT licence (ticketref:17579).
We do not need compile the very old VBoxGuestR3LibXFree86, latest XFree86/X
windows server was release is dated of 2007 and because fail to build when
we unbundle all X11 sources, files like xf86_ansic.h no longer exists.
The question is if we use VBOX_USE_SYSTEM_XORG_HEADERS or
VBOX_USE_SYSTEM_GL_HEADERS or VBOX_NO_LEGACY_XORG_X11

/usr/include/x11 never existed we only have /usr/include/X11 (with capital X),
IIRC was I that introduce this typo (when we added
VBOX_USE_SYSTEM_XORG_HEADERS).

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/lib/Makefile.kmk (modified) (1 diff)
• x11/vboxvideo/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk

@@ -41 +41 @@
 ifndef VBOX_ONLY_VALIDATIONKIT
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
   LIBRARIES += \
         VBoxGuestR3LibXFree86
+ endif
  endif
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -407 +407 @@
         $(PATH_ROOT)/src/VBox/Runtime/include \
         $(VBOX_GRAPHICS_INCS) \
-        /usr/include/x11 \
         /usr/include/xorg \
         /usr/include/pixman-1