[arch-commits] Commit in virtualbox/trunk (009-gcc-7.patch PKGBUILD)
Christian Hesse
eworm at archlinux.org
Tue Jul 4 12:34:35 UTC 2017
Date: Tuesday, July 4, 2017 @ 12:34:35
Author: eworm
Revision: 242308
upgpkg: virtualbox 5.1.22-3
include gcc 7 build fix
Added:
virtualbox/trunk/009-gcc-7.patch
Modified:
virtualbox/trunk/PKGBUILD
-----------------+
009-gcc-7.patch | 303 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 4
2 files changed, 306 insertions(+), 1 deletion(-)
Added: 009-gcc-7.patch
===================================================================
--- 009-gcc-7.patch (rev 0)
+++ 009-gcc-7.patch 2017-07-04 12:34:35 UTC (rev 242308)
@@ -0,0 +1,303 @@
+Index: trunk/src/recompiler/Makefile.kmk
+===================================================================
+--- trunk/src/recompiler/Makefile.kmk (revision 67289)
++++ trunk/src/recompiler/Makefile.kmk (revision 67298)
+@@ -320,7 +320,8 @@
+
+ $$(VBoxREMImp_0_OUTDIR)/VBoxREMRes.o: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.rc $(MAKEFILE_CURRENT) $(VBOX_VERSION_MK) | $$(dir $$@)
+ $(call MSG_GENERATE,,$@)
+- $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' -- $(TOOL_MINGWW64_PREFIX)windres \
++ $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' \
++ -- $(TOOL_$(VBoxRemPrimary_TOOL.win.$(KBUILD_TARGET_ARCH))_PREFIX)windres \
+ $(addprefix -I,$(INCS) $(PATH_SDK_$(VBOX_WINPSDK)_INC) $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)) \
+ -DVBOX_SVN_REV=$(VBOX_SVN_REV) \
+ -DVBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 50000) \
+Index: trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c
+===================================================================
+--- trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c (nonexistent)
++++ trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c (revision 67298)
+@@ -0,0 +1,53 @@
++/* $Id$ */
++/** @file
++ * IPRT - __udivmoddi4 implementation
++ */
++
++/*
++ * Copyright (C) 2006-2016 Oracle Corporation
++ *
++ * This file is part of VirtualBox Open Source Edition (OSE), as
++ * available from http://www.virtualbox.org. This file is free software;
++ * you can redistribute it and/or modify it under the terms of the GNU
++ * General Public License (GPL) as published by the Free Software
++ * Foundation, in version 2 as it comes in the "COPYING" file of the
++ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
++ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
++ *
++ * The contents of this file may alternatively be used under the terms
++ * of the Common Development and Distribution License Version 1.0
++ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
++ * VirtualBox OSE distribution, in which case the provisions of the
++ * CDDL are applicable instead of those of the GPL.
++ *
++ * You may elect to license modified versions of this file under the
++ * terms and conditions of either the GPL or the CDDL or both.
++ */
++
++#include <iprt/stdint.h>
++#include <iprt/uint64.h>
++
++uint64_t __udivmoddi4(uint64_t u64A, uint64_t u64B, uint64_t *pu64R);
++
++/**
++ * __udivmoddi4() implementation to satisfy external references from 32-bit
++ * code generated by gcc-7 or later.
++ *
++ * @param u64A The divident value.
++ * @param u64B The divisor value.
++ * @param pu64R A pointer to the reminder. May be NULL.
++ * @returns u64A / u64B
++ */
++uint64_t __udivmoddi4(uint64_t u64A, uint64_t u64B, uint64_t *pu64R)
++{
++ RTUINT64U Divident;
++ RTUINT64U Divisor;
++ RTUINT64U Quotient;
++ RTUINT64U Reminder;
++ Divident.u = u64A;
++ Divisor.u = u64B;
++ RTUInt64DivRem(&Quotient, &Reminder, &Divident, &Divisor);
++ if (pu64R)
++ *pu64R = Reminder.u;
++ return Quotient.u;
++}
+
+Property changes on: trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c
+___________________________________________________________________
+Added: svn:eol-style
+## -0,0 +1 ##
++native
+\ No newline at end of property
+Added: svn:keywords
+## -0,0 +1 ##
++Author Date Id Revision
+\ No newline at end of property
+Index: trunk/src/VBox/Runtime/Makefile.kmk
+===================================================================
+--- trunk/src/VBox/Runtime/Makefile.kmk (revision 67289)
++++ trunk/src/VBox/Runtime/Makefile.kmk (revision 67298)
+@@ -1850,6 +1850,7 @@
+ common/math/gcc/subdi3.c \
+ common/math/gcc/ucmpdi2.c \
+ common/math/gcc/udivdi3.c \
++ common/math/gcc/udivmoddi4.c \
+ common/math/gcc/umoddi3.c \
+ common/math/gcc/xordi3.c
+
+@@ -1942,6 +1943,7 @@
+ common/math/gcc/subdi3.c \
+ common/math/gcc/ucmpdi2.c \
+ common/math/gcc/udivdi3.c \
++ common/math/gcc/udivmoddi4.c \
+ common/math/gcc/umoddi3.c \
+ common/math/gcc/xordi3.c
+ endif
+@@ -2675,6 +2677,7 @@
+ common/math/gcc/subdi3.c \
+ common/math/gcc/ucmpdi2.c \
+ common/math/gcc/udivdi3.c \
++ common/math/gcc/udivmoddi4.c \
+ common/math/gcc/umoddi3.c \
+ common/math/gcc/xordi3.c
+ endif
+Index: trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp (revision 67289)
++++ trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp (revision 67298)
+@@ -49,6 +49,7 @@
+ ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
+ ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
+ ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
++ ${PATH_ROOT}/include/iprt/uint64.h=>include/iprt/uint64.h \
+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
+ ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
+ ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
+@@ -70,6 +71,7 @@
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>math/gcc/qdivrem.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>math/gcc/quad.h \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>math/gcc/udivdi3.c \
++ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivmoddi4.c=>math/gcc/udivmoddi4.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>math/gcc/umoddi3.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \
+Index: trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile (revision 67289)
++++ trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile (revision 67298)
+@@ -72,6 +72,7 @@
+ math/gcc/moddi3.o \
+ math/gcc/qdivrem.o \
+ math/gcc/udivdi3.o \
++ math/gcc/udivmoddi4.o \
+ math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+Index: trunk/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci (revision 67289)
++++ trunk/src/VBox/HostDrivers/VBoxPci/linux/files_vboxpci (revision 67298)
+@@ -48,6 +48,7 @@
+ ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
+ ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
+ ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
++ ${PATH_ROOT}/include/iprt/uint64.h=>include/iprt/uint64.h \
+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
+ ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
+ ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
+@@ -75,6 +76,7 @@
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>math/gcc/qdivrem.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>math/gcc/quad.h \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>math/gcc/udivdi3.c \
++ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivmoddi4.c=>math/gcc/udivmoddi4.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>math/gcc/umoddi3.c \
+ ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
+ ${PATH_OUT}/version-generated.h=>version-generated.h \
+Index: trunk/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxPci/linux/Makefile (revision 67289)
++++ trunk/src/VBox/HostDrivers/VBoxPci/linux/Makefile (revision 67298)
+@@ -76,6 +76,7 @@
+ math/gcc/moddi3.o \
+ math/gcc/qdivrem.o \
+ math/gcc/udivdi3.o \
++ math/gcc/udivmoddi4.o \
+ math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile (revision 67289)
++++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile (revision 67298)
+@@ -76,6 +76,7 @@
+ math/gcc/moddi3.o \
+ math/gcc/qdivrem.o \
+ math/gcc/udivdi3.o \
++ math/gcc/udivmoddi4.o \
+ math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt (revision 67289)
++++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt (revision 67298)
+@@ -49,6 +49,7 @@
+ ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
+ ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
+ ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
++ ${PATH_ROOT}/include/iprt/uint64.h=>include/iprt/uint64.h \
+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
+ ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
+ ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
+@@ -77,6 +78,7 @@
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>math/gcc/qdivrem.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>math/gcc/quad.h \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>math/gcc/udivdi3.c \
++ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivmoddi4.c=>math/gcc/udivmoddi4.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>math/gcc/umoddi3.c \
+ ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
+ ${PATH_OUT}/version-generated.h=>version-generated.h \
+Index: trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv (revision 67289)
++++ trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv (revision 67298)
+@@ -65,6 +65,7 @@
+ ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
+ ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
+ ${PATH_ROOT}/include/iprt/uint128.h=>include/iprt/uint128.h \
++ ${PATH_ROOT}/include/iprt/uint64.h=>include/iprt/uint64.h \
+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
+ ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
+ ${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
+@@ -108,6 +109,7 @@
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>math/gcc/qdivrem.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>math/gcc/quad.h \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>math/gcc/udivdi3.c \
++ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivmoddi4.c=>math/gcc/udivmoddi4.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>math/gcc/umoddi3.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \
+Index: trunk/src/VBox/HostDrivers/Support/linux/Makefile
+===================================================================
+--- trunk/src/VBox/HostDrivers/Support/linux/Makefile (revision 67289)
++++ trunk/src/VBox/HostDrivers/Support/linux/Makefile (revision 67298)
+@@ -162,6 +162,7 @@
+ math/gcc/moddi3.o \
+ math/gcc/qdivrem.o \
+ math/gcc/udivdi3.o \
++ math/gcc/udivmoddi4.o \
+ math/gcc/divdi3.o \
+ math/gcc/umoddi3.o
+ endif
+Index: trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module
+===================================================================
+--- trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module (revision 67289)
++++ trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module (revision 67298)
+@@ -38,6 +38,7 @@
+ divdi3.o \
+ moddi3.o \
+ udivdi3.o \
++ udivmoddi4.o \
+ umoddi3.o \
+ qdivrem.o
+ endif
+Index: trunk/src/VBox/Additions/linux/sharedfolders/files_vboxsf
+===================================================================
+--- trunk/src/VBox/Additions/linux/sharedfolders/files_vboxsf (revision 67289)
++++ trunk/src/VBox/Additions/linux/sharedfolders/files_vboxsf (revision 67298)
+@@ -38,6 +38,7 @@
+ ${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
+ ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
+ ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
++ ${PATH_ROOT}/include/iprt/uint64.h=>include/iprt/uint64.h \
+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
+ ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
+ ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
+@@ -73,6 +74,7 @@
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>qdivrem.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>quad.h \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>udivdi3.c \
++ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivmoddi4.c=>udivmoddi4.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>umoddi3.c \
+ ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
+ ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/Makefile.module=>Makefile \
+Index: trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest
+===================================================================
+--- trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest (revision 67289)
++++ trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest (revision 67298)
+@@ -54,6 +54,7 @@
+ ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
+ ${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
+ ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
++ ${PATH_ROOT}/include/iprt/uint64.h=>include/iprt/uint64.h \
+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
+ ${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
+ ${PATH_ROOT}/include/iprt/x86.h=>include/iprt/x86.h \
+@@ -113,6 +114,7 @@
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/qdivrem.c=>common/math/gcc/qdivrem.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/quad.h=>common/math/gcc/quad.h \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>common/math/gcc/udivdi3.c \
++ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivmoddi4.c=>common/math/gcc/udivmoddi4.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>common/math/gcc/umoddi3.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \
+ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \
+Index: trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile
+===================================================================
+--- trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile (revision 67289)
++++ trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile (revision 67298)
+@@ -100,6 +100,7 @@
+ common/math/gcc/divdi3.o \
+ common/math/gcc/moddi3.o \
+ common/math/gcc/udivdi3.o \
++ common/math/gcc/udivmoddi4.o \
+ common/math/gcc/umoddi3.o \
+ common/math/gcc/qdivrem.o
+ endif
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-04 12:32:16 UTC (rev 242307)
+++ PKGBUILD 2017-07-04 12:34:35 UTC (rev 242308)
@@ -11,7 +11,7 @@
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
pkgver=5.1.22
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -70,6 +70,7 @@
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch'
'008-no-vboxvideo.patch'
+ '009-gcc-7.patch'
)
sha256sums=('fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899'
'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
@@ -89,6 +90,7 @@
'5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
'6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f'
'8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
+ '0f5cb04362be022bba71295867aac9eaddf9ece0d3ce82c083d70829564ec8d2'
)
prepare() {
More information about the arch-commits
mailing list