Merge remote-tracking branch 'up/f29' into f29-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
Merge remote-tracking branch 'up/f29' into master-riscv64
2018-10-17 12:09:11 +02:00 · 2018-08-26 20:45:52 +03:00 · 2018-07-26 17:18:59 +02:00 · 2018-07-26 17:16:44 +02:00 · 2018-05-09 17:28:10 +02:00 · 2018-05-09 12:18:40 +02:00
1 changed files with 7 additions and 1 deletions
--- a/openssl.spec
+++ b/openssl.spec
@ -22,7 +22,7 @@
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.1.1
-Release: 3%{?dist}
+Release: 3.0.riscv64%{?dist}
 Epoch: 1
 # We have to remove certain patented algorithms from the openssl source
 # tarball with the hobble-openssl script which is included below.
@ -237,6 +237,9 @@ export HASHBANGPERL=/usr/bin/perl
 # RPM_OPT_FLAGS, so we can skip specifiying them here.
 ./Configure \
 	--prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
+%ifarch riscv64
+	--libdir=%{_lib} \
+%endif
 	--system-ciphers-file=%{_sysconfdir}/crypto-policies/back-ends/openssl.config \
 	zlib enable-camellia enable-seed enable-rfc3779 enable-sctp \
 	enable-cms enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method \
@ -449,6 +452,9 @@ export LD_LIBRARY_PATH
 %postun libs -p /sbin/ldconfig

 %changelog
+* Wed Oct 17 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> 1.1.1-3.0.riscv64
+- Add --libdir=%{_lib} for riscv64 (uses linux-generic64)
+
 * Mon Sep 17 2018 Tomáš Mráz <tmraz@redhat.com> 1.1.1-3
 - reinstate accidentally dropped patch for weak ciphersuites
Author	SHA1	Message	Date
David Abdurachmanov	1ee3891bdc	Merge remote-tracking branch 'up/f29' into f29-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-10-17 12:09:11 +02:00
David Abdurachmanov	e18afbe0a2	Merge remote-tracking branch 'up/f29' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-08-26 20:45:52 +03:00
David Abdurachmanov	03af38ee90	Fix changelog entry Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-07-26 17:18:59 +02:00
David Abdurachmanov	8078616a9d	Merge commit '9189f03055d4d55949fb897a1049b800327a312f' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-07-26 17:16:44 +02:00
David Abdurachmanov	2e9a37afa3	Fix typo in %ifarch Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-09 17:28:10 +02:00
David Abdurachmanov	366634ae28	Add --libdir=%{_lib} for riscv64 We need this because there is no riscv64 specific configuration which would set multilib to 64. It should be easy to write one and send to the upstream. Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-09 12:18:40 +02:00