commit 90b9ff25a708fd1cdb0dbc37da57c099947d24df
Author: Jan Rękorajski <[email protected]>
Date: Sun May 3 21:41:38 2015 +0200
- fix building on x32
clamav.spec | 2 ++
x32.patch | 14 ++++++++++++++
2 files changed, 16 insertions(+)
---
diff --git a/clamav.spec b/clamav.spec
index 4c1551c..7821729 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -40,6 +40,7 @@ Patch2: am-nosilentrules.patch
Patch3: ac2.68.patch
Patch4: %{name}-openssl.patch
Patch5: %{name}-major.patch
+Patch6: x32.patch
URL: http://www.clamav.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -181,6 +182,7 @@ Biblioteki statyczne clamav.
%endif
#%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%{__libtoolize}
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..0dcb994
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- clamav-0.98.7/libclamav/bytecode_vm.c~ 2015-04-22 21:50:01.000000000
+0200
++++ clamav-0.98.7/libclamav/bytecode_vm.c 2015-05-03 21:40:54.448612567
+0200
+@@ -1248,7 +1248,11 @@
+ gettimeofday(&tv1, NULL);
+ tv1.tv_sec -= tv0.tv_sec;
+ tv1.tv_usec -= tv0.tv_usec;
++#ifdef __ILP32__
++ cli_dbgmsg("intepreter bytecode run finished in %lluus, after
executing %u opcodes\n",
++#else
+ cli_dbgmsg("intepreter bytecode run finished in %luus, after
executing %u opcodes\n",
++#endif
+ tv1.tv_sec*1000000 + tv1.tv_usec, pc);
+ }
+ if (stop == CL_EBYTECODE) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/clamav.git/commitdiff/90b9ff25a708fd1cdb0dbc37da57c099947d24df
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
