Changeset 97979 in vbox

Timestamp:

Jan 4, 2023 2:35:52 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155070

Message:

libs/openssl-3.0.7: Edit openssl headers on staging/install when using older gcc that warns about pragma once being obsolete. ValKit build has some 45000 warnings about this. This also changes the openssl templates to use the staged headers when compiling rather than the ones in the src/libs/openssl-3.0.7/include.

File:

• trunk/src/libs/openssl-3.0.7/Config.kmk (modified) (2 diffs)

trunk/src/libs/openssl-3.0.7/Config.kmk

@@ -194 +194 @@
         gen-includes/openssl/x509v3.h=>x509v3.h
 
+## Workaround for GCC 3.3.x or older always warning about '\#pragma once' being obsolete.
+#
+# We edit the headers during installation and qualifies the \#pragma once with
+# RT_WITHOUT_PRAGMA_ONCE like we do for our own headers (defined root templates).
+#
+# 1=<src>, 2=<dst>, 3=<target>, 4=<flags>, 5=install|stage
+# context vars: uid, gid, mode
+#
+if "$(VBOX_GCC_VERSION_CC)" < 30400 && "$(KBUILD_TARGET)" != "win"
+ define crypto-headers_INSTALLER
+        $$(RM) -f -- "$(2)"
+        $$(SED) -e 's/^\([#][[:space:]]*\)pragma[[:space:]][[:space:]]*once.*/\1ifndef RT_WITHOUT_PRAGMA_ONCE\n\1 pragma once\n\1endif/' \
+                --output "$(2)" "$(1)"
+        $(if $(mode),$(CHMOD) "$(mode)" -- "$(2)",)
+ endef
+endif
+
 #
 # The templates used for the crypo lib and all its sublibraries.
@@ -302 +319 @@
 
 TEMPLATE_LIBCRYPTO_INCS := \
+        $(dir $(VBOX_PATH_CRYPTO_HEADERS)) \
         $(VBOX_PATH_OPENSSL) \
         $(VBOX_PATH_OPENSSL)/include \