Changeset 72114 in vbox for trunk/src/VBox

Timestamp:

May 4, 2018 4:00:01 PM (7 years ago)

Author:

vboxsync

Message:

Additions/Linux: always build Additions complatible with old distributions.
bugref:9112: Linux Additions: fix building binaries for older Linux user space
A second attempt at making our Linux Additions binaries work with old versions
of glibc without any special configuration settings, now that the build
problem on EL5 is fixed.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)

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

@@ -68 +68 @@
         supc++ \
         gcc_eh
-ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
- # This has to be in LIBS, so as to be linked in after supc++ and gcc_eh, which
- # depend on the symbols it provides.  Static supc++ and gcc_eh on at least
- # Ubuntu 17.04 contain references to __sprintf_chk and __stack_chk_fail.
- # Furthermore, they contain references to memcpy, which needs to be resolved
- # to memcpy@GLIBC_2.2.5, which we solve in a not-very-satisfactory way with a
- # wrapper.
- ifeq ($(KBUILD_TARGET),linux)
+# This has to be in LIBS, so as to be linked in after supc++ and gcc_eh, which
+# depend on the symbols it provides.  Static supc++ and gcc_eh on at least
+# Ubuntu 17.04 contain references to __sprintf_chk and __stack_chk_fail.
+# Furthermore, they contain references to memcpy, which needs to be resolved
+# to memcpy@GLIBC_2.2.5, which we solve in a not-very-satisfactory way with a
+# wrapper.
+ifeq ($(KBUILD_TARGET),linux)
 VBoxClient_LIBS    += \
         $(PATH_ROOT)/src/VBox/Additions/x11/VBoxClient/chk_stubs.c
 VBoxClient_LDFLAGS.amd64 += \
         -Wl,--wrap=memcpy
- endif
 endif