[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f2234b33d7d5159cd3aedfec22752f688a5ebd99 - IPFire-SCM

4 Jul 2019

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 3.x development tree".
The branch, master has been updated
       via  f2234b33d7d5159cd3aedfec22752f688a5ebd99 (commit)
       via  53f29fdabecf854d37174d21fefa2fc909b95f86 (commit)
       via  300f804f2f531f392c343b93f8167ab0d7c1daed (commit)
       via  f1e06ebcdb68c08b6c1eeeda73c2465ac531ea2f (commit)
      from  98d86f51793c0643a0a400d53a4d1c4cf82057a1 (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 f2234b33d7d5159cd3aedfec22752f688a5ebd99
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jul 4 15:44:05 2019 +0200
clamav: Disable llvm support
When enabled, LLVM provides the capability to just-in-time compile ClamAV bytecode signatures.
    Without LLVM, ClamAV uses a built-in bytecode interpreter to execute bytecode signatures.
    The mechanism is different, but the results are same and the performance overall is comparable.
At present only LLVM versions up to LLVM 3.6.2 are supported by ClamAV, and LLVM 3.6.2 is old enough
    that newer distributions no longer provide it. Therefore, the ClamAV Devs recommend using the
    --disable-llvm configure option.
Fixes #11601
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 53f29fdabecf854d37174d21fefa2fc909b95f86
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jul 4 14:23:12 2019 +0200
llvm: New package
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 300f804f2f531f392c343b93f8167ab0d7c1daed
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jul 4 14:23:11 2019 +0200
libedit: Update to 3.1-20190324
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f1e06ebcdb68c08b6c1eeeda73c2465ac531ea2f
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Thu Jul 4 14:23:10 2019 +0200
cmake: Update to 3.14.5
This is a minor update to the latest stable version of cmake.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 clamav/clamav.nm   |   3 +-
 cmake/cmake.nm     |  12 +++---
 libedit/libedit.nm |   4 +-
 llvm/llvm.nm       | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 123 insertions(+), 9 deletions(-)
 create mode 100644 llvm/llvm.nm
Difference in files:

diff --git a/clamav/clamav.nm b/clamav/clamav.nm
index 9a550544e..9abe6c40e 100644
--- a/clamav/clamav.nm
+++ b/clamav/clamav.nm
@@ -5,7 +5,7 @@
name       = clamav
 version    = 0.101.2
-release    = 1
+release    = 2
groups     = System Environment/Daemons
 url        = http://www.clamav.net
@@ -49,6 +49,7 @@ build
    	--with-user=clamupdate \
            --with-group=clamupdate \
    	--disable-rpath \
+		--disable-llvm \
    	have_cv_ipv6=yes
# User and group have to exist to compile the source code,
diff --git a/cmake/cmake.nm b/cmake/cmake.nm
index 8bb3a3c63..ee8e91015 100644
--- a/cmake/cmake.nm
+++ b/cmake/cmake.nm
@@ -6,7 +6,7 @@
 name       = cmake
 version    = %{ver_maj}.%{ver_min}
 ver_maj    = 3.14
-ver_min    = 1
+ver_min    = 5
 release    = 1
groups     = Development/Tools
@@ -15,11 +15,11 @@ license    = BSD
 summary    = Cross-platform make system.
description
-	CMake is used to control the software compilation process using simple \
-	platform and compiler independent configuration files. CMake generates \
-	native makefiles and workspaces that can be used in the compiler \
-	environment of your choice. CMake is quite sophisticated: it is possible \
-	to support complex environments requiring system configuration, pre-processor \
+	CMake is used to control the software compilation process using simple
+	platform and compiler independent configuration files. CMake generates
+	native makefiles and workspaces that can be used in the compiler
+	environment of your choice. CMake is quite sophisticated: it is possible
+	to support complex environments requiring system configuration, pre-processor
    generation, code generation, and template instantiation.
 end
diff --git a/libedit/libedit.nm b/libedit/libedit.nm
index 0ed39f79a..831a943d8 100644
--- a/libedit/libedit.nm
+++ b/libedit/libedit.nm
@@ -5,7 +5,7 @@
name       = libedit
 version    = 3.1-%{version_date}
-version_date = 20141030
+version_date = 20190324
 release    = 1
 thisapp    = %{name}-%{version_date}-3.1
@@ -28,7 +28,7 @@ build
    end
# The timestamp in the tarball differs from the name
-	DIR_APP = %{DIR_SRC}/%{name}-20141029-3.1
+	DIR_APP = %{DIR_SRC}/%{name}-20190324-3.1
configure_options += \
    	--disable-static \
diff --git a/llvm/llvm.nm b/llvm/llvm.nm
new file mode 100644
index 000000000..fc7d5cfee
--- /dev/null
+++ b/llvm/llvm.nm
@@ -0,0 +1,113 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team info@ipfire.org                   #
+###############################################################################
+
+name       = llvm
+version    = 8.0.0
+release    = 1
+
+groups     = Applications/System
+url        = http://llvm.org
+license    = NCSA
+summary    = The Low Level Virtual Machine.
+
+description
+	LLVM is a compiler infrastructure designed for compile-time, link-time,
+	runtime, and idle-time optimization of programs from arbitrary programming
+	languages. The compiler infrastructure includes mirror sets of programming
+	tools as well as libraries with equivalent functionality.
+end
+
+source_dl  = http://releases.llvm.org/%%7Bversion%7D/
+sources    = %{thisapp}.src.tar.xz
+
+build
+	requires
+		binutils >= 2.32
+		cmake >= 3.14.5
+		gcc
+		gcc-c++
+		libedit-devel >= 3.1-20190324
+		libffi-devel
+		libxml2-devel
+		zlib-devel
+	end
+
+	DIR_APP = %{DIR_SRC}/%{thisapp}.src
+
+	# Limit parallelization to only 2 jobs at the same time.
+	PARALLELISMFLAGS = -j2
+
+	# Set suffix for libdir based on the build architecture.
+	llvm_libdir_suffix =
+
+	if "%{DISTRO_ARCH}" == "x86_64"
+		llvm_libdir_suffix = 64
+	end
+
+	if "%{DISTRO_ARCH}" == "aarch64"
+		llvm_libdir_suffix = 64
+	end
+
+	build
+		# Create and switch into build directory.
+		mkdir -pv %{DIR_APP}/build
+		cd %{DIR_APP}/build
+
+		%{cmake} .. \
+			-DLLVM_BUILD_TOOLS=ON \
+			-DLLVM_BUILD_UTILS=ON \
+			-DLLVM_BUILD_TESTS=OFF \
+			-DLLVM_BUILD_EXAMPLES=OFF \
+			-DLLVM_BUILD_BENCHMARKS=OFF \
+			-DCMAKE_BUILD_TYPE=Release \
+			-DCMAKE_INSTALL_RPATH=";" \
+			-DLLVM_BUILD_LLVM_DYLIB=OFF \
+			-DLLVM_LINK_LLVM_DYLIB=OFF \
+			-DBUILD_SHARED_LIBS=ON \
+			-DLLVM_ENABLE_FFI=ON \
+			-DLLVM_ENABLE_RTTI=ON \
+			-DLLVM_ENABLE_LIBCXX=OFF \
+			-DLLVM_TARGETS_TO_BUILD="host;" \
+			-DCMAKE_C_COMPILER=gcc \
+			-DCMAKE_CXX_COMPILER=g++ \
+			-DCMAKE_CXX_FLAGS_RELEASE:STRING="%{CFLAGS}" \
+			-DCMAKE_EXE_LINKER_FLAGS="%{LDFLAGS}" \
+			-DENABLE_PIC=1 \
+			-DLLVM_PARALLEL_LINK_JOBS=1 \
+			-DLLVM_ENABLE_DUMP=ON \
+			-DLLVM_LIBDIR_SUFFIX=%{llvm_libdir_suffix} \
+			-Wno-dev
+
+		make %{PARALELLISMFLAGS}
+	end
+
+	test
+		cd %{DIR_APP}/build
+
+		make check-all %{PARALELLISMFLAGS}
+	end
+
+	install
+		cd %{DIR_APP}/build
+
+		make install DESTDIR=%{BUILDROOT}
+	end
+end
+
+packages
+	package llvm
+
+	package llvm-libs
+		template LIBS
+	end
+
+	package llvm-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
hooks/post-receive
--
IPFire 3.x development tree

    