[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. d0a1fbbe550aeabef272d841d58fc050bb9475e0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. d0a1fbbe550aeabef272d841d58fc050bb9475e0

[git]

[-- Attachment #1: Type: text/plain, Size: 2944 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  d0a1fbbe550aeabef272d841d58fc050bb9475e0 (commit)
      from  439d2a5743d68a7b6108a8db2db91aefd9fac37c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d0a1fbbe550aeabef272d841d58fc050bb9475e0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Sep 28 11:14:34 2013 +0000

    clamav: Fix building on ARM.
    
    Disable using fanotify:
    
      CC     fan.o
    In file included from fan.c:38:
    fan-syscalllib.h:14:3: error: #error "System call numbers not defined for this architecture"
    In file included from fan.c:38:
    fan-syscalllib.h: In function 'fanotify_init':
    fan-syscalllib.h:19: error: '__NR_fanotify_init' undeclared (first use in this function)
    fan-syscalllib.h:19: error: (Each undeclared identifier is reported only once
    fan-syscalllib.h:19: error: for each function it appears in.)
    fan-syscalllib.h: In function 'fanotify_mark':
    fan-syscalllib.h:25: error: '__NR_fanotify_mark' undeclared (first use in this function)
    make[3]: *** [fan.o] Error 1
    make[3]: Leaving directory `/usr/src/clamav-0.98/clamd'
    make[2]: *** [all-recursive] Error 1
    make[2]: Leaving directory `/usr/src/clamav-0.98'
    make[1]: *** [all] Error 2
    make[1]: Leaving directory `/usr/src/clamav-0.98'
    make: *** [/usr/src/log/clamav-0.98] Error 2

-----------------------------------------------------------------------

Summary of changes:
 lfs/clamav | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/lfs/clamav b/lfs/clamav
index 45606fd..9878fec 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -36,6 +36,10 @@ PAK_VER    = 23
 
 DEPS       = ""
 
+ifeq "$(MACHINE_TYPE)" "arm"
+CONFIGURE_FLAGS = --disable-fanotify
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -77,7 +81,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/var/ipfire/clamav \
+		$(CONFIGURE_FLAGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	mkdir -p /usr/share/clamav/


hooks/post-receive
--
IPFire 2.x development tree