forked from pool/virtualbox
86d45b138a
Changed the building of VBoxVNC to remove the hack used earlier. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=332
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
Index: VirtualBox-5.1.22/configure
|
|
===================================================================
|
|
--- VirtualBox-5.1.22.orig/configure
|
|
+++ VirtualBox-5.1.22/configure
|
|
@@ -447,8 +447,8 @@ check_gcc()
|
|
-o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
|
|
-o \( $cc_maj -eq 5 -a $cc_min -gt 9 \) \
|
|
-o \( $cc_maj -eq 6 -a $cc_min -gt 9 \) \
|
|
- -o $cc_maj -gt 6 ]; then
|
|
- log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x, gcc 5.x or gcc 6.x"
|
|
+ -o $cc_maj -gt 7 ]; then
|
|
+ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 4.x, gcc 5.x, gcc 6.x or gcc7.x"
|
|
fail really
|
|
else
|
|
log_success "found version $cc_ver"
|
|
Index: VirtualBox-5.1.22/src/VBox/Devices/PC/ipxe/src/arch/i386/interface/pxe/pxe_preboot.c
|
|
===================================================================
|
|
--- VirtualBox-5.1.22.orig/src/VBox/Devices/PC/ipxe/src/arch/i386/interface/pxe/pxe_preboot.c
|
|
+++ VirtualBox-5.1.22/src/VBox/Devices/PC/ipxe/src/arch/i386/interface/pxe/pxe_preboot.c
|
|
@@ -262,6 +262,7 @@ pxenv_restart_tftp ( struct s_PXENV_TFTP
|
|
|
|
/* Restart NBP */
|
|
rmlongjmp ( pxe_restart_nbp, PXENV_RESTART_TFTP );
|
|
+ return 0;
|
|
}
|
|
|
|
/* PXENV_START_UNDI
|