diff options
| author | Marian Buschsieweke <marian.buschsieweke@ovgu.de> | 2019-03-28 16:49:57 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-04-03 13:42:19 +0000 |
| commit | ad43781ec3904e1fdc21939ad706d7bc603b35d3 (patch) | |
| tree | 86231e3793093c6a8d4502006f9598797d7d220c /community/virtualbox-guest-additions/VBoxClient.patch | |
| parent | 602544c4b5565599fdcb079b3f32952dd8ce3038 (diff) | |
| download | aports-ad43781ec3904e1fdc21939ad706d7bc603b35d3.tar.bz2 aports-ad43781ec3904e1fdc21939ad706d7bc603b35d3.tar.xz | |
community/virtualbox-guest-additions: X11 & OpenRC
- Added subpkg $pkgname-x11 (provides VBoxClient)
- Split of OpenRC as subpkg (as is state of the art)
Diffstat (limited to 'community/virtualbox-guest-additions/VBoxClient.patch')
| -rw-r--r-- | community/virtualbox-guest-additions/VBoxClient.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/community/virtualbox-guest-additions/VBoxClient.patch b/community/virtualbox-guest-additions/VBoxClient.patch new file mode 100644 index 0000000000..80e6707bfc --- /dev/null +++ b/community/virtualbox-guest-additions/VBoxClient.patch @@ -0,0 +1,39 @@ +diff -rupN VirtualBox-6.0.4-bak/src/VBox/Additions/x11/VBoxClient/Makefile.kmk VirtualBox-6.0.4/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +--- VirtualBox-6.0.4-bak/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2019-03-28 16:29:24.277508391 +0100 ++++ VirtualBox-6.0.4/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2019-03-28 16:30:24.893944894 +0100 +@@ -72,14 +72,6 @@ VBoxClient_LIBS += \ + supc++ \ + gcc_eh + +-# This forces the memcpy references in the static libraries to go to +-# __wrap_memcpy, which we can wrap around memcpy@GLIBC_2.2.5. I do not know +-# how else to do that without recompiling or implementing our own memcpy. +-ifeq ($(KBUILD_TARGET),linux) +-VBoxClient_LDFLAGS.amd64 += \ +- -Wl,--wrap=memcpy +-endif +- + ifdef VBOX_WITH_GUEST_PROPS + VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS + endif +diff -rupN VirtualBox-6.0.4-bak/src/VBox/Additions/x11/VBoxClient/chk_stubs.c VirtualBox-6.0.4/src/VBox/Additions/x11/VBoxClient/chk_stubs.c +--- VirtualBox-6.0.4-bak/src/VBox/Additions/x11/VBoxClient/chk_stubs.c 2019-03-28 16:29:24.277508391 +0100 ++++ VirtualBox-6.0.4/src/VBox/Additions/x11/VBoxClient/chk_stubs.c 2019-03-28 16:29:52.860733197 +0100 +@@ -43,17 +43,3 @@ void __stack_chk_fail(void) + fprintf(stderr, "Stack check failed!\n"); + _exit(1); + } +- +-#ifdef __x86_64 +-/* Furthermore, wrap references to memcpy to force them to go to the right +- * version. We are forced to do it this way because the shared libraries +- * supc++ and gcc_eh contain references which we cannot change. */ +- +-extern void *__wrap_memcpy(void *dest, const void *src, size_t n); +- +-asm (".symver memcpy, memcpy@GLIBC_2.2.5"); +-void *__wrap_memcpy(void *dest, const void *src, size_t n) +-{ +- return memcpy(dest, src, n); +-} +-#endif |