From 1a4ccaa8f8f9a7d2a9b74cd17c7f9b494a9aa54b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 3 Apr 2017 19:24:44 +0000 Subject: [PATCH] Simplify spec with rpm macros. --- llvm-config.h | 9 --------- llvm.spec | 17 ++++++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 llvm-config.h diff --git a/llvm-config.h b/llvm-config.h deleted file mode 100644 index 2fa08c9..0000000 --- a/llvm-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "llvm-config-32.h" -#elif __WORDSIZE == 64 -#include "llvm-config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/llvm.spec b/llvm.spec index ca2b26f..e2086fe 100644 --- a/llvm.spec +++ b/llvm.spec @@ -7,15 +7,13 @@ Name: llvm Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Low Level Virtual Machine License: NCSA URL: http://llvm.org Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz -Source100: llvm-config.h - # recognize s390 as SystemZ when configuring build Patch0: llvm-3.7.1-cmake-s390.patch Patch1: 0001-CMake-Fix-pthread-handling-for-out-of-tree-builds.patch @@ -26,6 +24,7 @@ BuildRequires: zlib-devel BuildRequires: libffi-devel BuildRequires: ncurses-devel BuildRequires: python3-sphinx +BuildRequires: multilib-rpm-config %if %{with gold} BuildRequires: binutils-devel %endif @@ -70,10 +69,7 @@ Summary: LLVM static libraries Static libraries for the LLVM compiler infrastructure. %prep -%setup -q -n %{name}-%{version}.src -%patch0 -p1 -b .s390 -%patch1 -p1 -b .pthread-fix -%patch67 -p1 -b .rust67 +%autosetup -n %{name}-%{version}.src -p1 %ifarch armv7hl @@ -151,8 +147,8 @@ make install DESTDIR=%{buildroot} # fix multi-lib mv -v %{buildroot}%{_bindir}/llvm-config{,-%{__isa_bits}} -mv -v %{buildroot}%{_includedir}/llvm/Config/llvm-config{,-%{__isa_bits}}.h -install -m 0644 %{SOURCE100} %{buildroot}%{_includedir}/llvm/Config/llvm-config.h + +%multilib_fix_c_header --file %{_includedir}/llvm/Config/llvm-config.h %check cd _build @@ -199,6 +195,9 @@ fi %{_libdir}/*.a %changelog +* Wed May 10 2017 Tom Stellard - 4.0.0-2 +- Simplify spec with rpm macros. + * Wed May 10 2017 Tom Stellard - 4.0.0-1 - LLVM 4.0.0 Final Release