[PATCH 1/3] cmake: Update to 3.14.5

[PATCH 1/3] cmake: Update to 3.14.5

[Stefan Schantl]

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

This is a minor update to the latest stable version of cmake.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 cmake/cmake.nm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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
 
-- 
2.21.0

[PATCH 2/3] libedit: Update to 3.1-20190324

[Stefan Schantl]

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

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 libedit/libedit.nm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 \
-- 
2.21.0

[PATCH 3/3] llvm: New package

[Stefan Schantl]

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

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 llvm/llvm.nm | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 llvm/llvm.nm

diff --git a/llvm/llvm.nm b/llvm/llvm.nm
new file mode 100644
index 000000000..7e89256d3
--- /dev/null
+++ b/llvm/llvm.nm
@@ -0,0 +1,113 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)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/%{version}/
+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
-- 
2.21.0

Re: [PATCH 3/3] llvm: New package

[Michael Tremer]

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

Hi,

> On 4 Jul 2019, at 13:23, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> llvm/llvm.nm | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 113 insertions(+)
> create mode 100644 llvm/llvm.nm
> 
> diff --git a/llvm/llvm.nm b/llvm/llvm.nm
> new file mode 100644
> index 000000000..7e89256d3
> --- /dev/null
> +++ b/llvm/llvm.nm
> @@ -0,0 +1,113 @@
> +###############################################################################
> +# IPFire.org    - An Open Source Firewall Solution                            #
> +# Copyright (C) - IPFire Development Team <info(a)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/%{version}/
> +sources    = %{thisapp}.src.tar.xz
> +
> +build
> +	requires
> +		binutils >= 2.32
> +		cmake >= 3.14.5
> +		gcc
> +		gcc-c++
> +		libedit-devel 3.1-20190324

You forgot the >= sign here which I had to add in order to build this.

> +		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 \

Do we not want debug info here?

> +			-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 \

What is this for? Why can we not do this in parallel?

> +			-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
> -- 
> 2.21.0
>