- up to final 1.1.1

[packages/openssl.git] / engines-dir.patch

diff --git a/engines-dir.patch b/engines-dir.patch
index fb78ec4f510b9f7e45e6d6066558593a1ddaf696..20f5d1a0d4a66d2df70e7f33a749c2848c9eccbc 100644 (file)
--- a/engines-dir.patch
+++ b/engines-dir.patch
@@ -1,13 +1,11 @@
-use /lib not /usr/lib for engines path
-
---- openssl-1.1.0-pre6/Configurations/unix-Makefile.tmpl~      2016-08-04 17:00:44.000000000 +0300
-+++ openssl-1.1.0-pre6/Configurations/unix-Makefile.tmpl       2016-08-06 02:13:21.613568293 +0300
-@@ -151,7 +151,7 @@
-           our $libdir = $config{libdir} || "lib$multilib";
-           $libdir -}
- ENGINESDIR={- use File::Spec::Functions;
--              catdir($prefix,$libdir,"engines-$sover") -}
-+              catdir("/",$libdir,"engines-$sover") -}
+--- openssl-1.1.1/Configurations/unix-Makefile.tmpl~   2018-09-13 13:40:10.000000000 +0200
++++ openssl-1.1.1/Configurations/unix-Makefile.tmpl    2018-09-13 13:40:42.065819616 +0200
+@@ -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)/engines-{- $sover_dirname -}
  
- MANDIR=$(INSTALLTOP)/share/man
- DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
+ # Convenience variable for those who want to set the rpath in shared
+ # libraries and applications