[clamav] fixed build with recent gcc/glibc toolchain

ensc ensc at fedoraproject.org
Sun Feb 5 12:37:06 UTC 2012


commit 6134d15e7d0b1e64b6927648789de8b3a1057a7b
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Feb 5 13:02:29 2012 +0100

    fixed build with recent gcc/glibc toolchain

 clamav.spec      |    4 ++++
 llvm-glibc.patch |   12 ++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index 9fd647b..19bde2d 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -73,6 +73,8 @@ Patch26:	clamav-0.95-cliopts.patch
 Patch27:	clamav-0.95.3-umask.patch
 # https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=patch&collapsed=&headers=1&format=raw
 Patch29:	clamav-0.96.2-jitoff.patch
+# https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Intercept.cpp?r1=128086&r2=137567
+Patch30:	llvm-glibc.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -400,6 +402,7 @@ The systemd initscripts for clamav-scanner.
 %apply -n26 -p1 -b .cliopts
 %apply -n27 -p1 -b .umask
 %apply -n29 -p1 -b .jitoff
+%apply -n30 -p1
 %{?apply_end}
 
 install -p -m0644 %SOURCE300 clamav-milter/
@@ -866,6 +869,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
 - fixed SELinux restorecon invocation
 - added trigger to fix SELinux contexts of logfiles created by old
   packages
+- fixed build with recent gcc/glibc toolchain
 
 * Sat Jan 21 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.97.3-1703
 - rewrote clamav-notify-servers to be init system neutral
diff --git a/llvm-glibc.patch b/llvm-glibc.patch
new file mode 100644
index 0000000..67dbdd7
--- /dev/null
+++ b/llvm-glibc.patch
@@ -0,0 +1,12 @@
+Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+===================================================================
+--- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
++++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+@@ -52,6 +52,7 @@ static void runAtExitHandlers() {
+ #include <sys/stat.h>
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+ /* stat functions are redirecting to __xstat with a version number.  On x86-64 
+  * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' 
+  * available as an exported symbol, so we have to add it explicitly.


More information about the scm-commits mailing list