rpms
/
Random123
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch to fix s390x build

This commit is contained in:
Ankur Sinha (Ankur Sinha Gmail) 2020-03-08 11:57:01 +00:00
parent 15825d5f17
commit 1a99467d8f
No known key found for this signature in database
GPG Key ID: F8D8C0BEBAC898BD
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Random123-1.13.2-s390x.patch Normal file
View File

@ -0,0 +1,33 @@
diff -up Random123-1.13.2/include/Random123/features/gccfeatures.h.orig Random123-1.13.2/include/Random123/features/gccfeatures.h
--- Random123-1.13.2/include/Random123/features/gccfeatures.h.orig 2020-02-24 06:09:37.192339552 -0500
+++ Random123-1.13.2/include/Random123/features/gccfeatures.h 2020-02-24 06:09:56.902339552 -0500
@@ -34,7 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#define R123_GNUC_VERSION (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
-#if !defined(__x86_64__) && !defined(__i386__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__)
+#if !defined(__x86_64__) && !defined(__i386__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__s390x__)
# error "This code has only been tested on x86, powerpc and a few arm platforms."
#include <including_a_nonexistent_file_will_stop_some_compilers_from_continuing_with_a_hopeless_task>
{ /* maybe an unbalanced brace will terminate the compilation */
diff -up Random123-1.13.2/tests/util_cpu.h.orig Random123-1.13.2/tests/util_cpu.h
--- Random123-1.13.2/tests/util_cpu.h.orig 2020-02-24 06:45:47.762339552 -0500
+++ Random123-1.13.2/tests/util_cpu.h 2020-02-24 07:00:13.302339552 -0500
@@ -128,9 +128,14 @@ static double clockspeedHz(int *ncores,
dprintf(("cleaned modelname is %s\n", *modelnamep));
}
if ((s = strstr(buf, "cpu MHz")) || (s = strstr(buf, "clock"))) {
- if (s[1] == 'p') // cpu MHz
- CHECKNOTZERO(sscanf(s, "cpu MHz : %lf %n", &xMhz, &i));
- else // clock
+ if (s[1] == 'p') { // cpu MHz
+ if (s[8] == ':')
+ CHECKNOTZERO(sscanf(s, "cpu MHz : %lf %n", &xMhz, &i));
+ else if (s[8] == 's')
+ CHECKNOTZERO(sscanf(s, "cpu MHz static : %lf %n", &xMhz, &i));
+ else if (s[8] == 'd')
+ continue; // cpu MHz dynamic
+ } else // clock
CHECKNOTZERO(sscanf(s, "clock : %lfMHz %n", &xMhz, &i));
dprintf(("parsed %f %d\n", xMhz, i));
if (xMhz > Mhz) Mhz = xMhz;

9
Random123.spec
View File

@ -2,17 +2,18 @@
Name: Random123
Version: 1.13.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Library of random number generators
License: BSD
URL: http://www.deshawresearch.com/resources_random123.html
Source0: http://www.deshawresearch.com/downloads/download_random123.cgi/%{name}-%{version}.tar.gz
Patch0: 0001-add-missing-headers.patch
Patch1: Random123-1.13.2-s390x.patch
# gccfeatures.h mentions what arches are supported
# these aren't on the list
ExcludeArch: mips64r2 mips32r2 s390 s390x
ExcludeArch: mips64r2 mips32r2 s390
BuildRequires: doxygen
# For tests
@ -79,6 +80,10 @@ popd
%doc examples
%changelog
* Sun Mar 08 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.13.2-2
- Include patch to support s390x (sent and accepted upstream)
- Enable s390x build
* Sun Feb 23 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.13.2-1
- Update to latest release
- Run new tests