Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2011-12-08 11:28:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haveged", Maintainer is "mvysko...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2011-11-29 12:52:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2011-12-08 11:28:13.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 2 07:26:32 UTC 2011 - co...@suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- @@ -10,0 +16,5 @@ + +------------------------------------------------------------------- +Tue Nov 1 17:46:35 CET 2011 - r...@suse.de + +- fix build on ia64, s390, s390x New: ---- haveged-otherarch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.djX9Db/_old 2011-12-08 11:28:16.000000000 +0100 +++ /var/tmp/diff_new_pack.djX9Db/_new 2011-12-08 11:28:16.000000000 +0100 @@ -15,12 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: haveged Version: 1.3 -Release: 2 -License: GPLv3 +Release: 0 +License: GPL-3.0 Summary: Feed entropy into random pool Url: http://www.issihosts.com/haveged/ Group: System/Daemons @@ -28,8 +26,10 @@ Source1: %{name}.init Source2: %{name}.service Patch1: %{name}-ppc64.patch +Patch2: %{name}-otherarch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: %{arm} +BuildRequires: automake Requires(pre): %insserv_prereq %if 0%{suse_version} >= 1140 Requires(pre): sysvinit(syslog) @@ -52,6 +52,7 @@ %prep %setup -q %patch1 +%patch2 %build autoreconf -fiv ++++++ haveged-otherarch.patch ++++++ --- configure.ac +++ configure.ac @@ -81,6 +81,14 @@ HA_CPPFLAGS="-DHAVE_ISA_IA64" ;; + s390-*) + HA_CPPFLAGS="-DHAVE_ISA_S390" + ;; + + s390x-*) + HA_CPPFLAGS="-DHAVE_ISA_S390X" + ;; + powerpc*|pcc-*|powerpc64|ppc64) HA_CPPFLAGS="-DHAVE_ISA_PPC" ;; --- src/havegecollect.h +++ src/havegecollect.h @@ -124,12 +124,25 @@ #ifdef HAVE_ISA_IA64 #define ARCH "ia64" -#define CPUID(op,reg) ASM("mov %0=cpuid[%1]"\ +/* commented out, does not compile, ro 2011-11-01 +hash define CPUID(op,reg) ASM("mov %0=cpuid[%1]"\ : "=r" (value)\ : "r" (reg)) +hash define HASCPUID(x) x=1 + */ #define HARDCLOCK(x) ASM("mov %0=ar.itc" : "=r"(x)) -#define HASCPUID(x) x=1 #endif + +#ifdef HAVE_ISA_S390 +#define ARCH "s390" +#define HARDCLOCK(x) { unsigned long long cycles ; __asm__("stck 0(%0)" : : "a" (&(cycles)) : "memory", "cc"); x = cycles; } +#endif + +#ifdef HAVE_ISA_S390X +#define ARCH "s390x" +#define HARDCLOCK(x) { unsigned long long cycles ; __asm__("stck 0(%0)" : : "a" (&(cycles)) : "memory", "cc"); x = cycles; } +#endif + #endif /** * Use the "&&" extension to calculate the LOOP_PT -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
