pool/libsodium
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 723945 from home:michel_mno:branches:devel:libraries:c_c++

Browse Source 
-  Add libsodium_configure_cpuid_chg.patch and call autoconf
   to regenerate configure script with proper CPUID checking.
   Required at least for PowerPC and ARM now that LTO enabled.

OBS-URL: https://build.opensuse.org/request/show/723945
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libsodium?expand=0&rev=74
This commit is contained in:
Dirk Mueller 2019-08-20 12:15:17 +00:00 committed by Git OBS Bridge
parent 18d139ee50
commit 2fff9987a6
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsodium.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 16 09:17:55 UTC 2019 - Michel Normand <normand@linux.vnet.ibm.com>
- Add libsodium_configure_cpuid_chg.patch and call autoconf
to regenerate configure script with proper CPUID checking.
Required at least for PowerPC and ARM now that LTO enabled.
-------------------------------------------------------------------
Sun Jun 16 10:04:32 UTC 2019 - ecsos@opensuse.org

6
libsodium.spec
View File

@ -29,7 +29,9 @@ Source0: https://download.libsodium.org/libsodium/releases/%{name}-%{vers
Source1: https://download.libsodium.org/libsodium/releases/%{name}-%{version}.tar.gz.sig
Source2: %{name}.keyring
Source99: baselibs.conf
BuildRequires: libtool
BuildRequires: pkgconfig
Patch1: libsodium_configure_cpuid_chg.patch
%description
NaCl (pronounced "salt") is a new easy-to-use high-speed software library
@ -62,10 +64,10 @@ to compile and develop applications that use libsodium.
%prep
%setup -q
%patch1 -p1
%build
# Do _NOT_ change CFLAGS
# See https://github.com/jedisct1/libsodium/issues/604
autoreconf -fvi
%configure \
--disable-static \
--disable-silent-rules

28
libsodium_configure_cpuid_chg.patch Normal file
View File

@ -0,0 +1,28 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: libsodium configure cpuid chg
Date: Fri, 16 Aug 2019 10:58:52 +0200
libsodium configure cpuid chg
To avoid to have bad detection of cpuid when lto is enabled.
This should solve the old upstream issue#604
https://github.com/jedisct1/libsodium/issues/604
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libsodium-1.0.18/configure.ac
===================================================================
--- libsodium-1.0.18.orig/configure.ac
+++ libsodium-1.0.18/configure.ac
@@ -694,7 +694,7 @@ AC_SUBST(HAVE_TI_MODE_V)
HAVE_CPUID_V=0
AS_IF([test "$enable_asm" != "no"],[
AC_MSG_CHECKING(for cpuid instruction)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[
unsigned int cpu_info[4];
__asm__ __volatile__ ("xchgl %%ebx, %k1; cpuid; xchgl %%ebx, %k1" :
"=a" (cpu_info[0]), "=&r" (cpu_info[1]),