From: Beat Bolli <dev@drbeat.li>
Date: Thu, 26 Feb 2026 21:20:16 +0000 (+0100)
Subject: remove OPENSSL_USE_NODELETE from the config
X-Git-Tag: openssl-4.0.0-alpha1~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b97177bf7bb4119919e9d8dbfb01c7876e0698b3;p=thirdparty%2Fopenssl.git

remove OPENSSL_USE_NODELETE from the config

Commits 31659fe326 (Introduce OPENSSL_ATEXIT_CLEANUP env. variable.,
2025-11-24) and 994413f995 (Update NEWS.md, 2025-12-15) removed the last
uses of this macro. Remove it in the configuration as well.

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Wed Mar  4 10:21:36 2026
(Merged from https://github.com/openssl/openssl/pull/30199)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 36a0f8c3ac2..a038c3cb914 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -686,7 +686,6 @@ my %targets = (
                                    release => "-O3"),
         cflags           => threads("-pthread"),
         cxxflags         => combine("-std=c++11", threads("-pthread")),
-        lib_cppflags     => "-DOPENSSL_USE_NODELETE",
         ex_libs          => add("-ldl", threads("-pthread")),
         bn_ops           => "BN_LLONG RC4_CHAR",
         thread_scheme    => "pthreads",
@@ -1973,8 +1972,7 @@ my %targets = (
                               ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
         cflag_incfirst   => '/FIRST_INCLUDE=',
         lib_defines      =>
-            add("OPENSSL_USE_NODELETE",
-                "_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED=1",
+            add("_XOPEN_SOURCE", "_XOPEN_SOURCE_EXTENDED=1",
                 sub {
                     return vms_info()->{def_zlib}
                         ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : ();