libre/clamav: building without llvm

1 files changed, 44 insertions, 44 deletions

diff --git a/libre/clamav/PKGBUILD b/libre/clamav/PKGBUILD
index 7f3fb5166..7faa780e6 100644
--- a/libre/clamav/PKGBUILD
+++ b/libre/clamav/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 292502 2017-04-08 08:19:57Z foutrelis $
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: André Silva <emulatorman@riseup.net>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 # Contributor (Arch): Dale Blount <dale@archlinux.org>
 # Contributor (Arch): Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: André Silva <emulatorman@parabola.nu>
-# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 _pkgname=clamav-libre
 pkgname=clamav
 pkgver=0.99.2
-pkgrel=6.parabola1
+pkgrel=6.parabola2
 pkgdesc='Anti-virus toolkit for Unix, without nonfree decompression engine for RAR archives'
 url='http://www.clamav.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('libmilter')
-makedepends_x86_64=('llvm')
-makedepends_i686=("${makedepends_x86_64[@]}")
 depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'pcre')
-depends_x86_64=('llvm-libs')
-depends_i686=("${depends_x86_64[@]}")
-depends_armv7h=('gcc-libs')
 validpgpkeys=('B964E6D7BC7D7C82CCB8D45840B8EA2364221D53'
               'F79FB2D08751574C5D3FDFFBB3D5342C260429A0')
 mksource=("http://www.clamav.net/downloads/production/${pkgname}-${pkgver}.tar.gz"{,.sig})
@@ -52,50 +47,55 @@ backup=('etc/clamav/clamd.conf'
 install=install
 
 mksource() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	msg2 "remove nonfree unRAR utility files from the source"
-	rm -rv libclamunrar
-	rm -v COPYING.unrar
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  msg2 "remove nonfree unRAR utility files from the source"
+  rm -rv libclamunrar
+  rm -v COPYING.unrar
 }
 
 prepare() {
-	#if [ "$CARCH" = i686 -o "$CARCH" = x86_64 ]; then
-		cd "${srcdir}/${pkgname}-${pkgver}"
-		patch -Np1 -i ../clamav-0.99.2-gcc-6.patch
-		patch -Np1 -i ../make_it_compile_against_openssl_1_1_0.patch
-		autoreconf -fi
-	#fi
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../clamav-0.99.2-gcc-6.patch
+  patch -Np1 -i ../make_it_compile_against_openssl_1_1_0.patch
+  autoreconf -fi
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	# --disable-zlib-vcheck because the configure script thinks that
-	# zlib 1.2.11 is older than 1.2.2
-	./configure \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-		--disable-zlib-vcheck \
-		--enable-milter \
-		--disable-unrar
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # --disable-zlib-vcheck:
+  #    the configure script thinks that zlib 1.2.11 is older than 1.2.2
+  # --enable-llvm=no:
+  #    workaround for database update issues
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc/clamav \
+    --with-dbdir=/var/lib/clamav \
+    --disable-clamav \
+    --disable-zlib-vcheck \
+    --enable-milter \
+    --disable-unrar \
+    --enable-llvm=no
 
-        sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-	make
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 
-	install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
-	install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
-	install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
-	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
+  install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+  install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
+  install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
+  install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
+  install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
+  install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
 
-	install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
-	install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
+  install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
+  install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
 }