Skip to content

Commit 61cb97f

Browse files
committed
[packaging] Update spec to llvm 7.0.1. Contributes to JB#37662
Remove obsolete sb2 patch.
1 parent a28a7b8 commit 61cb97f

File tree

4 files changed

+35
-39
lines changed

4 files changed

+35
-39
lines changed

rpm/llvm-3.0-rpmlintrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

rpm/llvm-3.1-sb2-build-workaround.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

rpm/llvm.spec

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
Name: llvm
2-
Version: 3.3
2+
Version: 7.0.1
33
Release: 0
44
Summary: The Low Level Virtual Machine (An Optimizing Compiler Infrastructure)
55
License: University of Illinois/NCSA Open Source License
66
Group: Development/Tools
77
URL: http://llvm.org/
88
Source: %{version}/%{name}-%{version}.tar.gz
99
Source1: LLVMBuild.txt
10-
Source100: llvm-3.0-rpmlintrc
11-
Patch0: llvm-3.1-sb2-build-workaround.patch
1210
Patch1: nosse4-avx.patch
1311
Requires(post): /sbin/ldconfig
1412
Requires(postun): /sbin/ldconfig
15-
BuildRequires: gcc >= 3.4, python
13+
BuildRequires: cmake
14+
BuildRequires: gcc, python
1615

1716
%description
1817
LLVM is a compiler infrastructure designed for compile-time, link-time, runtime,
@@ -33,42 +32,51 @@ Requires: %{name} = %{version}
3332
LLVM Header files
3433

3534
%prep
36-
%setup -q -n %{name}-%{version}/%{name}
37-
%patch0 -p1
38-
#%patch1 -p1
35+
%setup -q -n %{name}-%{version}/%{name}/llvm
3936
cp %{_sourcedir}/LLVMBuild.txt projects/
4037

4138
%build
42-
./configure \
43-
--build=%{_target_platform} \
44-
--host=%{_target_platform} \
45-
--prefix=%{_prefix} \
46-
--bindir=%{_bindir} \
47-
--datadir=%{_datadir} \
48-
--includedir=%{_includedir} \
49-
--libdir=%{_libdir} \
50-
--enable-optimized \
51-
--enable-assertions \
52-
--disable-docs
53-
make %{?_smp_mflags} tools-only
39+
40+
mkdir -p build
41+
pushd build
42+
43+
%cmake .. -G "Unix Makefiles" \
44+
-DBUILD_SHARED_LIBS:BOOL=OFF \
45+
-DCMAKE_BUILD_TYPE=Release \
46+
-DLLVM_BUILD_DOCS:BOOL=OFF \
47+
-DLLVM_BUILD_LLVM_DYLIB:BOOL=OFF \
48+
-DLLVM_BUILD_RUNTIME:BOOL=OFF \
49+
-DLLVM_ENABLE_ASSERTIONS:BOOL=OFF \
50+
-DLLVM_INCLUDE_BENCHMARKS:BOOL=OFF \
51+
-DLLVM_INCLUDE_DIRS:PATH=%{_includedir} \
52+
-DLLVM_INCLUDE_EXAMPLES:BOOL=OFF \
53+
-DLLVM_INCLUDE_TEST:BOOL=OFF \
54+
-DLLVM_LINK_LLVM_DYLIB:BOOL=OFF \
55+
-DLLVM_TARGETS_TO_BUILD=Native \
56+
-DLLVM_TOOLS_BINARY_DIR:PATH=%{_bindir}
57+
58+
# Jobs limited to 4 to prevent OBS from running out of memory
59+
make -j4
60+
popd build
5461

5562
%install
5663
rm -rf %{buildroot}
57-
make install DESTDIR=%{buildroot}
64+
make -C build install/strip DESTDIR=%{buildroot}
5865

5966
%post -p /sbin/ldconfig
6067

6168
%postun -p /sbin/ldconfig
6269

6370
%files
6471
%defattr(-, root, root)
65-
%doc CREDITS.TXT LICENSE.TXT README.txt
6672
%{_bindir}/*
67-
%attr(744,-,-) %{_libdir}/*.so
73+
%{_libdir}/*.so.*
74+
%{_datadir}/opt-viewer
6875

6976
%files devel
7077
%defattr(-, root, root)
71-
%attr(744,-,-) %{_libdir}/*.a
78+
%{_libdir}/*.a
79+
%{_libdir}/*.so
7280
%{_includedir}/llvm
7381
%{_includedir}/llvm-c
74-
82+
%{_libdir}/cmake

rpm/nosse4-avx.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -ru llvm-3.1.src/lib/Target/X86/X86Subtarget.cpp llvm-3.1.src-noavxsse4/lib/Target/X86/X86Subtarget.cpp
2-
--- llvm-3.1.src/lib/Target/X86/X86Subtarget.cpp 2012-06-12 14:35:17.000000000 +0200
3-
+++ llvm-3.1.src-noavxsse4/lib/Target/X86/X86Subtarget.cpp 2013-02-13 14:01:46.918216857 +0100
1+
diff -ru llvm-3.1.src/llvm/lib/Target/X86/X86Subtarget.cpp llvm-3.1.src-noavxsse4/llvm/lib/Target/X86/X86Subtarget.cpp
2+
--- llvm-3.1.src/llvm/lib/Target/X86/X86Subtarget.cpp 2012-06-12 14:35:17.000000000 +0200
3+
+++ llvm-3.1.src-noavxsse4/llvm/lib/Target/X86/X86Subtarget.cpp 2013-02-13 14:01:46.918216857 +0100
44
@@ -194,10 +194,11 @@
55
if ((EDX >> 26) & 1) { X86SSELevel = SSE2; ToggleFeature(X86::FeatureSSE2); }
66
if (ECX & 0x1) { X86SSELevel = SSE3; ToggleFeature(X86::FeatureSSE3); }

0 commit comments

Comments
 (0)