virtualbox-7.1.4
This commit is contained in:
@@ -1,112 +1,73 @@
|
||||
From 9736107f45a17f04e4a0f9ab14fe913660cde3ad Mon Sep 17 00:00:00 2001
|
||||
From c2dc4a940e485a26e1b729e94c5aa710834d1542 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hesse <mail@eworm.de>
|
||||
Date: Mon, 17 Oct 2022 15:07:30 +0200
|
||||
Subject: [PATCH] drop -Wno-format
|
||||
Date: Tue, 18 Apr 2023 22:59:50 +0200
|
||||
Subject: [PATCH 1/1] drop -Wno-format
|
||||
|
||||
---
|
||||
src/VBox/Devices/EFI/Firmware/Config.kmk | 2 +-
|
||||
.../Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf | 6 +++---
|
||||
.../CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 6 +++---
|
||||
src/VBox/Devices/Makefile.kmk | 2 +-
|
||||
src/VBox/Devices/PC/ipxe/Makefile.kmk | 2 +-
|
||||
src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk | 2 +-
|
||||
src/VBox/Main/webservice/Makefile.kmk | 3 +--
|
||||
src/libs/xpcom18a4/Config.kmk | 6 +++---
|
||||
8 files changed, 14 insertions(+), 15 deletions(-)
|
||||
src/VBox/Devices/EFI/Firmware/Config.kmk | 2 +-
|
||||
src/VBox/Devices/Makefile.kmk | 2 +-
|
||||
src/VBox/Devices/PC/ipxe/Makefile.kmk | 2 +-
|
||||
src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk | 2 +-
|
||||
src/VBox/Main/webservice/Makefile.kmk | 3 +--
|
||||
5 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/VBox/Devices/EFI/Firmware/Config.kmk b/src/VBox/Devices/EFI/Firmware/Config.kmk
|
||||
index e2e537f1..de640194 100644
|
||||
index 5e7dcf91..04f4c854 100644
|
||||
--- a/src/VBox/Devices/EFI/Firmware/Config.kmk
|
||||
+++ b/src/VBox/Devices/EFI/Firmware/Config.kmk
|
||||
@@ -155,7 +155,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \
|
||||
ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/
|
||||
@@ -165,7 +165,7 @@ TEMPLATE_VBoxEfiBldProg_LIBS = \
|
||||
ifn1of ($(KBUILD_HOST), win) # This stuff isn't up to our standard at all! :/
|
||||
TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \
|
||||
-Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \
|
||||
- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \
|
||||
+ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \
|
||||
-Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label
|
||||
- -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format \
|
||||
+ -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow \
|
||||
-Wno-empty-body -Wno-unused-parameter -Wno-unused-variable -Wno-unused-label
|
||||
TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \
|
||||
-Wno-all -Wno-shadow -Wno-empty-body -Wno-unused-parameter -Wno-unused-variable \
|
||||
diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
index 5300ea32..e9485765 100644
|
||||
--- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
+++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
@@ -618,10 +618,10 @@
|
||||
# -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration).
|
||||
#
|
||||
GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
|
||||
+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
|
||||
GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
|
||||
+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
+ GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
|
||||
GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
|
||||
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
|
||||
diff --git a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||||
index 1b1d46b0..df9998a5 100644
|
||||
--- a/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||||
+++ b/src/VBox/Devices/EFI/Firmware/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
|
||||
@@ -567,10 +567,10 @@
|
||||
# -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration).
|
||||
#
|
||||
GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
|
||||
+ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS
|
||||
GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
|
||||
- GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable
|
||||
+ GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
+ GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable
|
||||
GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
|
||||
GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized
|
||||
GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize
|
||||
diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk
|
||||
index 02da1255..c2cbbc1c 100644
|
||||
index 613ff466..9123b767 100644
|
||||
--- a/src/VBox/Devices/Makefile.kmk
|
||||
+++ b/src/VBox/Devices/Makefile.kmk
|
||||
@@ -836,7 +836,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
|
||||
ifeq ($(KBUILD_TARGET),win)
|
||||
$(file)_CFLAGS = -wd4018
|
||||
else
|
||||
- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast
|
||||
+ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast
|
||||
endif
|
||||
endef
|
||||
@@ -859,7 +859,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SU
|
||||
ifeq ($(KBUILD_TARGET),win)
|
||||
$(file)_CFLAGS = -wd4018
|
||||
else
|
||||
- $(file)_CFLAGS += -Wno-sign-compare -Wno-format -Wno-bad-function-cast
|
||||
+ $(file)_CFLAGS += -Wno-sign-compare -Wno-bad-function-cast
|
||||
endif
|
||||
endef
|
||||
|
||||
diff --git a/src/VBox/Devices/PC/ipxe/Makefile.kmk b/src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
index 8a611f6d..c57f0454 100644
|
||||
index 6c95001a..9708145c 100644
|
||||
--- a/src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
+++ b/src/VBox/Devices/PC/ipxe/Makefile.kmk
|
||||
@@ -401,7 +401,7 @@ endif
|
||||
@@ -396,7 +396,7 @@ endif
|
||||
#
|
||||
BLDPROGS += ipxezbin
|
||||
ipxezbin_TEMPLATE = VBoxBldProg
|
||||
- ipxezbin_CFLAGS = -Wno-format -Wno-unused-function -Wno-pointer-arith
|
||||
+ ipxezbin_CFLAGS = -Wno-unused-function -Wno-pointer-arith
|
||||
ipxezbin_SOURCES = src/util/zbin.c
|
||||
ipxezbin_LIBS = lzma # @todo Can't assume liblzma on the build system
|
||||
|
||||
ifdef VBOX_WITH_LIBLZMA
|
||||
ipxezbin_INCS = $(SDK_VBoxLibLzma_INCS) # Can't use the proper SDK here as link order matters and liblzma depends on our runtime.
|
||||
diff --git a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
index b2bd260b..133e7398 100644
|
||||
index 394834e5..2f90d86f 100644
|
||||
--- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
+++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
||||
@@ -118,7 +118,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) && defined(VBOX_WITH_EXTPACK)
|
||||
VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0
|
||||
VBoxDTraceCmd_SDKS = VBOX_ZLIB
|
||||
ifn1of ($(KBUILD_TARGET), win)
|
||||
- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
|
||||
+ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
|
||||
endif
|
||||
VBoxDTraceCmd_INCS = \
|
||||
include \
|
||||
VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0
|
||||
VBoxDTraceCmd_SDKS = VBoxZlib
|
||||
ifn1of ($(KBUILD_TARGET), win)
|
||||
- VBoxDTraceCmd_CFLAGS = -Wno-format $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
|
||||
+ VBoxDTraceCmd_CFLAGS = $(VBOX_GCC_Wno-overlength-strings) -Wno-sign-compare -Wno-strict-prototypes -Wno-missing-prototypes -Wno-missing-declarations -Wno-shadow
|
||||
endif
|
||||
VBoxDTraceCmd_INCS = \
|
||||
include \
|
||||
diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk
|
||||
index 072d066e..d2feea75 100644
|
||||
index 84880dcd..f301f9cc 100644
|
||||
--- a/src/VBox/Main/webservice/Makefile.kmk
|
||||
+++ b/src/VBox/Main/webservice/Makefile.kmk
|
||||
@@ -260,7 +260,7 @@ ifdef VBOX_GSOAP_INSTALLED
|
||||
@@ -264,7 +264,7 @@ ifdef VBOX_GSOAP_INSTALLED
|
||||
ifn1of ($(KBUILD_TARGET), win)
|
||||
vboxsoap_CXXFLAGS += -Wno-shadow -Wno-parentheses $(VBOX_GCC_Wno-literal-suffix) \
|
||||
$(VBOX_GCC_Wno-stringop-overflow) $(VBOX_GCC_Wno-stringop-truncation) \
|
||||
@@ -115,35 +76,11 @@ index 072d066e..d2feea75 100644
|
||||
ifn1of ($(KBUILD_TYPE), debug) # Save time+memory by using -O0 instead of -O2.
|
||||
vboxsoap_CXXFLAGS += -O0 ## @todo this could be interesting for g++ (not clang++): -fcprop-registers
|
||||
endif
|
||||
@@ -331,7 +331,6 @@ ifdef VBOX_GSOAP_INSTALLED
|
||||
@@ -335,7 +335,6 @@ ifdef VBOX_GSOAP_INSTALLED
|
||||
$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
|
||||
ifn1of ($(KBUILD_TARGET), win)
|
||||
$(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS = \
|
||||
- -Wno-format \
|
||||
$(VBOX_GCC_Wno-int-in-bool-context) \
|
||||
$(VBOX_GCC_Wno-logical-op)
|
||||
- -Wno-format \
|
||||
$(VBOX_GCC_Wno-int-in-bool-context) \
|
||||
$(VBOX_GCC_Wno-logical-op)
|
||||
# currently necessary when compiling against OpenSSL 1.0 due to a missing
|
||||
diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk
|
||||
index 3b0831e5..a83a080b 100644
|
||||
--- a/src/libs/xpcom18a4/Config.kmk
|
||||
+++ b/src/libs/xpcom18a4/Config.kmk
|
||||
@@ -243,8 +243,8 @@ TEMPLATE_XPCOMEXE_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version
|
||||
#
|
||||
TEMPLATE_XPCOMTSTEXE = XPCOM executable files (testcases)
|
||||
TEMPLATE_XPCOMTSTEXE_EXTENDS = XPCOMEXE
|
||||
-TEMPLATE_XPCOMTSTEXE_CXXFLAGS = $(TEMPLATE_XPCOMEXE_CXXFLAGS) -Wno-format
|
||||
-TEMPLATE_XPCOMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS) -Wno-format
|
||||
+TEMPLATE_XPCOMTSTEXE_CXXFLAGS = $(TEMPLATE_XPCOMEXE_CXXFLAGS)
|
||||
+TEMPLATE_XPCOMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS)
|
||||
TEMPLATE_XPCOMTSTEXE_INST = $(INST_TESTCASE)
|
||||
ifdef VBOX_WITH_RUNPATH
|
||||
TEMPLATE_XPCOMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPCOMEXE_LDFLAGS)
|
||||
@@ -277,7 +277,7 @@ TEMPLATE_XPCOMBLDPROG_INCS = \
|
||||
$(VBOX_PATH_SDK)/bindings/xpcom/include/string \
|
||||
$(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
|
||||
$(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
|
||||
-TEMPLATE_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format
|
||||
+TEMPLATE_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast)
|
||||
TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti
|
||||
TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway.
|
||||
TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
|
||||
|
||||
Reference in New Issue
Block a user