Merge branch 'rickard/3pp-alt/OTP-20013' into sverker/28/3pp-alt/OTP-20106

Author: sverker

.github/scripts/otp-compliance.es

@@ -1295,10 +1295,22 @@ create_vendor_relations(NewVendorPackages, #{~"packages" := Packages, ~"relation
                           case Pkgs of
                               [#{~"SPDXID" := RootId}] ->
                                   case ID of
+                                      ~"SPDXRef-otp-erts-openssl" ->
+                                          create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
+                                      ~"SPDXRef-otp-erlinterface-openssl" ->
+                                          create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
+                                      ~"SPDXRef-otp-erts-ryu" ->
+                                          create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
+                                      ~"SPDXRef-otp-ryu-tochars" ->
+                                          create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
                                       ~"SPDXRef-otp-erts-zlib" ->
                                           create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
+                                      ~"SPDXRef-otp-erts-zstd" ->
+                                          create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
                                       ~"SPDXRef-otp-erts-asmjit" ->
                                           create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
+                                      ~"SPDXRef-otp-erts-tcl" ->
+                                          create_spdx_relation('OPTIONAL_COMPONENT_OF', ID, RootId);
                                       ~"SPDXRef-otp-erts-autoconf" ->
                                           %% hard-code that erts-autoconf is a build tool of
                                           create_spdx_relation('BUILD_TOOL_OF', ID, RootId);

HOWTO/INSTALL.md

@@ -372,7 +372,6 @@ Some of the available `configure` options are:
 *   `--with-javac=JAVAC` - Specify Java compiler to use
 *   `--{with,without}-javac` - Java compiler (without implies that the
     `jinterface` application won't be built)
-*   `--{enable,disable}-builtin-zlib` - Use the built-in source for zlib.
 *   `--{enable,disable}-dynamic-ssl-lib` - Enable or disable dynamic OpenSSL
     libraries when linking the crypto NIF. By default dynamic linking is
     done unless it does not work or is if it is a Windows system.
@@ -455,6 +454,22 @@ Some of the available `configure` options are:
     flags when compiling Erlang/OTP. This can be useful in some scenarios
     when the flags either causes Erlang/OTP not to build, or unacceptable
     performance degradations.
+*   `--enable-use-embedded-3pp-alternatives` - Use all available alternatives
+    instead of embedded 3pps. Implies all `--disable-builtin-*` options. Can
+    be overridden by individual `--enable-builtin-*` options.
+*   `--disable-use-embedded-3pp-alternatives` - Do not use any alternatives
+    to embedded 3pps. Implies all `--enable-builtin-*` options. Can be overridden
+    by individual `--disable-builtin-*` options.
+*   `--enable-builtin-ryu` - Use our own built-in ryu for float to short string.
+*   `--disable-builtin-ryu` - Use C++17 as an alternative for built-in ryu.
+*   `--enable-builtin-zstd` - Force use of our own built-in zstd.
+*   `--disable-builtin-zstd` - Find a static libzstd on the system to use.
+*   `--enable-builtin-zlib` - Force use of our own built-in zlib.
+*   `--disable-builtin-zlib` - Find a zlib on the system to use.
+*   `--enable-builtin-errno-id` - Force use of our own built-in errno-id.
+*   `--disable-builtin-errno-id` - Try to find an alternative on the system to use for errno-id
+*   `--enable-builtin-openssl` - Use built-in OpenSSL for MD5.
+*   `--disable-builtin-openssl` - Use alternative for built-in OpenSSL.
 
 If you or your system has special requirements please read the `Makefile` for
 additional configuration information.

HOWTO/SBOM.md

@@ -234,6 +234,10 @@ Fields summary:
 To update the package, perform any modifications in a `vendor.info` package
 and re-run the source SBOM generation steps ([Erlang/OTP source SBOM]).
 
+If the vendor package is optional, the `create_vendor_relations()` function in the `.github/scripts/otp-compliance.es` script needs to be updated to add the `OPTIONAL_COMPONENT_OF` relation for the package.
+
+For vendor packages in `erts`, `erlang:system_info(embedded_3pps)` (`erts/emulator/beam/erl_bif_info.c`) also needs to be updated. The 3pp should be part of either the value for the `included` key (the build includes the 3pp) or the `excluded` key (the build does not include the 3pp). If the package is optional, the build should automatically place it as part of the value of the correct key.
+
 ### Add a New Vendor Dependency
 
 Follow the same steps as in [Update SPDX Vendor Packages].

erts/config.h.in

@@ -78,6 +78,21 @@
    64-bit alignment will be forced. */
 #undef ERTS_STRUCTURE_ALIGNED_ALLOC
 
+/* Define if builtin errno id should be used */
+#undef ERTS_USE_BUILTIN_ERRNO_ID
+
+/* Define if builtin OpenSSL should be used for MD5 */
+#undef ERTS_USE_BUILTIN_OPENSSL
+
+/* Define if builtin ryu should be used */
+#undef ERTS_USE_BUILTIN_RYU
+
+/* Define if builtin zlib should be used */
+#undef ERTS_USE_BUILTIN_ZLIB
+
+/* Define if builtin zstd should be used */
+#undef ERTS_USE_BUILTIN_ZSTD
+
 /* Define if poll() should be used instead of select() */
 #undef ERTS_USE_POLL
 
@@ -1028,6 +1043,9 @@
 /* Define to 1 if you have the 'strerror' function. */
 #undef HAVE_STRERROR
 
+/* Define to 1 if you have the 'strerrorname_np' function. */
+#undef HAVE_STRERRORNAME_NP
+
 /* Define to 1 if you have the 'strerror_r' function. */
 #undef HAVE_STRERROR_R