11ba794d0c
Only the ca-dir patch applied cleanly. The MSYS2 one had to be re-done, as well as the enginesdir one (where we now completely side-step ./configure). This will require *tons* of packages to be rebuilt, and during the transition time the binaries will be broken because of the different name of the .dll, unless one copies back msys-crypto-1.0.0.dll and msys-ssl-1.0.0.dll (this is how Git for Windows handled that fragile upgrade phase). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
27 lines
1012 B
Diff
27 lines
1012 B
Diff
From b6518c65d63b5d910594fae100d75f42900a5055 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Mon, 3 Dec 2018 17:08:57 +0100
|
|
Subject: [PATCH 4/4] Override engines directory
|
|
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
---
|
|
Configurations/unix-Makefile.tmpl | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
|
|
index df5a5ae..969ed4b 100644
|
|
--- a/Configurations/unix-Makefile.tmpl
|
|
+++ b/Configurations/unix-Makefile.tmpl
|
|
@@ -170,7 +170,7 @@ LIBDIR={- our $libdir = $config{libdir};
|
|
# $(libdir) is chosen to be compatible with the GNU coding standards
|
|
libdir={- file_name_is_absolute($libdir)
|
|
? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
|
|
-ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}
|
|
+ENGINESDIR=$(libdir)/openssl/engines-{- $sover_dirname -}
|
|
|
|
# Convenience variable for those who want to set the rpath in shared
|
|
# libraries and applications
|
|
--
|
|
2.19.1
|
|
|