Changeset 72114 in vbox

Timestamp:

May 4, 2018 4:00:01 PM (6 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.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Additions/x11/VBoxClient/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -6635 +6635 @@
 endif
 
-ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
 # Use older versions of APIs which were improved in versions of glibc later
 # than what we are targetting, and do not use the stack protector, which
 # needs glibc 2.4 or later.
- TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux    = \
+TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux    = \
         -include $(PATH_ROOT)/include/iprt/linux/symvers.h \
         $(VBOX_GCC_fno-stack-protector)
- TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux      = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
+TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux      = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
 # The GNU_HASH ELF tag is not supported by older systems.
- TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux      += -Wl,--hash-style=sysv
-endif
+TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux      += -Wl,--hash-style=sysv
 
 #
@@ -6848 +6846 @@
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-ifdef VBOX_WITH_OLD_GLIBC_SUPPORT
-# The GNU_HASH ELF tag is not supported by older systems.
+# The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = --hash-style=sysv
-endif
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS          = -r

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