diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-08-08 23:30:30 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-08-08 23:30:30 +0300 |
| commit | 6313f49bccfa1d1f5c23e259ec124415b8791587 (patch) | |
| tree | b7688b861b317ae35827f3ae43592025792d8d29 | |
| parent | 0728bc6a6d9d708435dbc67a7dd643f8d2d2864b (diff) | |
| download | virtualbox-6313f49bccfa1d1f5c23e259ec124415b8791587.tar.gz | |
More patches for recent Dyson
| -rw-r--r-- | debian/patches/dyson-EXTENSIONS.patch | 33 | ||||
| -rw-r--r-- | debian/patches/dyson-gcc-4.9.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 49 insertions, 0 deletions
diff --git a/debian/patches/dyson-EXTENSIONS.patch b/debian/patches/dyson-EXTENSIONS.patch new file mode 100644 index 000000000..7dd144471 --- /dev/null +++ b/debian/patches/dyson-EXTENSIONS.patch @@ -0,0 +1,33 @@ +Description: Use all extensions, specifically struct lifreq, + that is disabled if _XOPEN_SOURCE is defined, and we do this + in Dyson by default. +Index: virtualbox/include/iprt/string.h +=================================================================== +--- virtualbox.orig/include/iprt/string.h ++++ virtualbox/include/iprt/string.h +@@ -77,9 +77,12 @@ + * Same case as with FreeBSD kernel: + * The string.h stuff clashes with sys/system.h + * ffs = find first set bit. ++ * strsignal conflicts when __EXTENSIONS__ is defined + */ + # define ffs ffs_string_h ++# define strsignal strsignal_string_h + # include <string.h> ++# undef strsignal + # undef ffs + # undef strpbrk + +Index: virtualbox/Config.kmk +=================================================================== +--- virtualbox.orig/Config.kmk ++++ virtualbox/Config.kmk +@@ -1406,7 +1406,7 @@ DEFS.linux = RT_OS_LINUX _FILE_OFFSET_ + DEFS.netbsd = RT_OS_NETBSD + DEFS.openbsd = RT_OS_OPENBSD + DEFS.os2 = RT_OS_OS2 __OS2__ +-DEFS.solaris = RT_OS_SOLARIS _FILE_OFFSET_BITS=64 ++DEFS.solaris = RT_OS_SOLARIS _FILE_OFFSET_BITS=64 __EXTENSIONS__ + DEFS.win = RT_OS_WINDOWS __WIN__ + DEFS.win.x86 = __WIN32__ + DEFS.win.amd64 = __WIN64__ diff --git a/debian/patches/dyson-gcc-4.9.patch b/debian/patches/dyson-gcc-4.9.patch new file mode 100644 index 000000000..39c3800c9 --- /dev/null +++ b/debian/patches/dyson-gcc-4.9.patch @@ -0,0 +1,14 @@ +Description: allow gcc 4.9 +Index: virtualbox/configure +=================================================================== +--- virtualbox.orig/configure ++++ virtualbox/configure +@@ -415,7 +415,7 @@ check_gcc() + elif [ $cc_maj -lt 3 \ + -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ +- -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \ ++ -o \( $cc_maj -eq 4 -a $cc_min -gt 10 \) \ + -o $cc_maj -gt 4 ]; then + log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8" + fail really diff --git a/debian/patches/series b/debian/patches/series index 6a8a93af4..a306cfa01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,3 +37,5 @@ dyson-guest-servces-enable.patch dyson-guest-servces-fix-dtd.patch dyson-guest-vboxservice-manifest-exec.patch dyson-vboxvideo-needs-misc_ctf.patch +dyson-EXTENSIONS.patch +dyson-gcc-4.9.patch |