[packages/openssl/dev-1.1] add --prefix and install engines to /lib
glen
glen at pld-linux.org
Sat Aug 6 01:29:08 CEST 2016
commit 2a83d92e4f7fe690944a385ea55fded5cfefdf4d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Aug 6 02:20:28 2016 +0300
add --prefix and install engines to /lib
engines-dir.patch | 13 +++++++++++++
openssl.spec | 5 +++--
2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index d9bb0d9..619881b 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -50,6 +50,7 @@ Patch6: %{name}-ldflags.patch
Patch7: %{name}-find.patch
Patch8: pic.patch
Patch10: %{name}_fix_for_x32.patch
+Patch11: engines-dir.patch
URL: http://www.openssl.org/
BuildRequires: bc
BuildRequires: perl-devel >= 1:5.10.0
@@ -280,8 +281,7 @@ mv %{name}-OpenSSL_1_0_2-stable/* .
%ifarch x32
%patch10 -p1
%endif
-
-sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
+%patch11 -p1
%build
touch Makefile.*
@@ -292,6 +292,7 @@ touch Makefile.*
OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \
PERL="%{__perl}" \
%{__perl} ./Configure \
+ --prefix=%{_prefix} \
--openssldir=%{_sysconfdir}/%{name} \
--libdir=%{_lib} \
shared \
diff --git a/engines-dir.patch b/engines-dir.patch
new file mode 100644
index 0000000..fb78ec4
--- /dev/null
+++ b/engines-dir.patch
@@ -0,0 +1,13 @@
+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") -}
+
+ MANDIR=$(INSTALLTOP)/share/man
+ DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/4c5d5b48afb2d1e178b494f23b8dff185534f0b4
More information about the pld-cvs-commit
mailing list