- Update to version 3.6.0

* No changelog upstream
- Remove lldb-underlink.patch, fixed upstream

- Update to version 3.6.0
  * See http://llvm.org/releases/3.6.0/docs/ReleaseNotes.html
- Removed the following patches, fixed upstream:
  * arm-remove-xfails.diff
  * libcxx-libdir.patch
  * llvm-config-lib64.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=400
This commit is contained in:
Ismail Dönmez
2015-03-02 10:18:08 +00:00
committed by Git OBS Bridge
parent 4d07e73cc1
commit e82beb38ed
34 changed files with 93 additions and 231 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package llvm
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
%define _revision 216961
%define _release_version 3.5.0
%define _revision 230777
%define _release_version 3.6.0
%define build_libcxx 0
@@ -26,7 +26,7 @@
%endif
Name: llvm
Version: 3.5.0
Version: 3.6.0
Release: 0
Summary: Low Level Virtual Machine
License: NCSA
@@ -41,9 +41,9 @@ Source4: http://llvm.org/releases/%{version}/libcxxabi-%{version}.src.tar
# cd docs
# make -f Makefile.sphinx man html
# cd ..
# tar cvJf llvm-docs-3.5.0.tar.xz llvm-3.5.0.src/docs/_build/{man,html}
Source5: llvm-docs-%{version}.tar.xz
Source6: cfe-docs-%{version}.tar.xz
# tar cvJf llvm-docs-3.6.0.src.tar.xz llvm-3.6.0.src/docs/_build/{man,html}
Source5: llvm-docs-%{version}.src.tar.xz
Source6: cfe-docs-%{version}.src.tar.xz
Source100: %{name}-rpmlintrc
Source101: baselibs.conf
# PATCH-FIX-OPENSUSE set-revision.patch idoenmez@suse.de -- Allow us to set revision
@@ -54,16 +54,13 @@ Patch2: assume-opensuse.patch
Patch3: clang-disable-ada-extension.patch
# PATCH-FIX-OPENSUSE default-to-i586.patch -- Use i586 as default target for 32bit
Patch4: default-to-i586.patch
Patch5: llvm-config-lib64.patch
# PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support
Patch6: arm_suse_support.diff
Patch7: cmake-host-triple.patch
# PATCH-FIX-OPENSUSE aarch64-suse-support.patch -- Enable AArch64 suse toolchain support
Patch8: aarch64-suse-support.patch
Patch9: arm-remove-xfails.diff
Patch10: clang-resourcedirs.patch
Patch11: libcxxabi-exceptions.patch
Patch12: libcxx-libdir.patch
Patch13: llvm-remove-clang-only-flags.patch
Patch14: llvm-fix-intrusiverefcntptr.patch
Patch15: llvm-fix-find-gcc5-install.patch
@@ -162,16 +159,11 @@ This package contains the Python bindings to clang (C language) frontend for LLV
%patch2
%patch3
%patch4
%if "%{_lib}" == "lib64"
%patch5 -p1
%endif
%patch6
%patch7 -p1
%patch8
%patch9
%patch10
%patch11
%patch12
%patch13 -p1
%patch14
%patch15
@@ -191,41 +183,10 @@ rm tools/clang/test/Driver/x86_features.c
sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
%if "%{_lib}" == "lib64"
# Nasty hardcoded path
sed -i s,CLANG_RESOURCE_DIR,'"../lib64/clang/%{_release_version}"',g tools/clang/lib/Driver/Driver.cpp
sed -i s,"/lib/LLVMgold","/lib64/LLVMgold",g tools/clang/lib/Driver/Tools.cpp
sed -i s,"}lib{","}lib64{",g tools/clang/test/Preprocessor/iwithprefix.c
sed -i s,'$ORIGIN/../lib','$ORIGIN/../lib64',g CMakeLists.txt
%endif
sed -i s,LLVM_LIBDIR,%{_lib}, tools/clang/lib/Driver/Driver.cpp
# Only enable target archs otherwise llvm-config is messed up
%ifarch %{ix86} x86_64
sed -i s,"subdirectories = .*","subdirectories = R600 X86", lib/Target/LLVMBuild.txt
%endif
%ifarch %arm
sed -i s,"subdirectories = .*","subdirectories = ARM", lib/Target/LLVMBuild.txt
%endif
%ifarch ppc64 ppc64le
sed -i s,"subdirectories = .*","subdirectories = PowerPC", lib/Target/LLVMBuild.txt
%endif
%ifarch s390x
sed -i s,"subdirectories = .*","subdirectories = SystemZ", lib/Target/LLVMBuild.txt
%endif
sed -i s,"IntelJITEvents OProfileJIT","", lib/ExecutionEngine/LLVMBuild.txt
echo > utils/unittest/LLVMBuild.txt
%build
TOPLEVEL=$PWD
mkdir stage1 stage2
pushd stage1
ln -sf lib lib64
# Define host-triple
%ifarch %{ix86}
@@ -271,10 +232,6 @@ ninja %{?_smp_mflags} clang
popd
pushd stage2
%if "%{_lib}" == "lib64"
ln -sf lib lib64
%endif
export CC=$TOPLEVEL/stage1/bin/clang
export CXX=$TOPLEVEL/stage1/bin/clang++
@@ -321,10 +278,6 @@ cd stage2
%if 0%{!?qemu_user_space_build:1}
# we just do not have enough memory with qemu emulation
%if "%{_lib}" == "lib64"
ln -s lib lib64
%endif
# Rebuild to enable tests, if we enable
# at first time gtest junk ends up in installed
# cmake files