rpm/llvm
SHA256
1
0
Fork 0
forked from pool/llvm
Code Pull Requests Activity

- Update to version 3.6.0

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aarch64-suse-support.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.5.0.src/lib/Driver/ToolChains.cpp
Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
===================================================================
--- cfe-3.5.0.src.orig/lib/Driver/ToolChains.cpp
+++ cfe-3.5.0.src/lib/Driver/ToolChains.cpp
--- cfe-3.6.0.src.orig/lib/Driver/ToolChains.cpp
+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp
@@ -1315,7 +1315,8 @@ bool Generic_GCC::GCCInstallationDetecto
static const char *const AArch64Triples[] = { "aarch64-none-linux-gnu",
"aarch64-linux-gnu",

29
arm-remove-xfails.diff
View File

@ -1,29 +0,0 @@
Those tests do not fail anymore, and unexpected passes
actually cause make check to fail. (dmueller@suse.com)
--- test/ExecutionEngine/2003-05-06-LivenessClobber.ll
+++ test/ExecutionEngine/2003-05-06-LivenessClobber.ll
@@ -1,7 +1,6 @@
; This testcase should return with an exit code of 1.
;
; RUN: not %lli %s
-; XFAIL: arm
@test = global i64 0 ; <i64*> [#uses=1]
--- test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
+++ test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
@@ -1,5 +1,4 @@
; RUN: %lli %s > /dev/null
-; XFAIL: arm
; This testcase failed to work because two variable sized allocas confused the
; local register allocator.
--- test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
+++ test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
@@ -1,5 +1,4 @@
; RUN: %lli %s > /dev/null
-; XFAIL: arm
; This testcase exposes a bug in the local register allocator where it runs out
; of registers (due to too many overlapping live ranges), but then attempts to

6
arm_suse_support.diff
View File

@ -1,7 +1,7 @@
Index: cfe-3.5.0.src/lib/Driver/ToolChains.cpp
Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
===================================================================
--- cfe-3.5.0.src.orig/lib/Driver/ToolChains.cpp
+++ cfe-3.5.0.src/lib/Driver/ToolChains.cpp
--- cfe-3.6.0.src.orig/lib/Driver/ToolChains.cpp
+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp
@@ -1322,9 +1322,11 @@ bool Generic_GCC::GCCInstallationDetecto
static const char *const ARMLibDirs[] = { "/lib" };

6
assume-opensuse.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.5.0.src/lib/Driver/ToolChains.cpp
Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
===================================================================
--- cfe-3.5.0.src/lib/Driver/ToolChains.cpp
+++ cfe-3.5.0.src/lib/Driver/ToolChains.cpp
--- cfe-3.6.0.src/lib/Driver/ToolChains.cpp
+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp
@@ -2794,6 +2794,7 @@ static bool IsUbuntu(enum Distro Distro)
}

3
cfe-3.5.0.src.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b
size 8233432

3
cfe-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be0e69378119fe26f0f2f74cffe82b7c26da840c9733fe522ed3c1b66b11082d
size 8640776

3
cfe-docs-3.5.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c9d5a14484424eb9126cae185e5905fa659497123805020ee854c6dd53c3602
size 574084

3
cfe-docs-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68429f8e025230c86bc0d8a5fa1ae4f54d37d4cdcc53468a9fc515cf914fd1d8
size 1102748

6
clang-disable-ada-extension.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.5.0.src/lib/Driver/Types.cpp
Index: cfe-3.6.0.src/lib/Driver/Types.cpp
===================================================================
--- cfe-3.5.0.src/lib/Driver/Types.cpp
+++ cfe-3.5.0.src/lib/Driver/Types.cpp
--- cfe-3.6.0.src/lib/Driver/Types.cpp
+++ cfe-3.6.0.src/lib/Driver/Types.cpp
@@ -158,8 +158,6 @@ types::ID types::lookupTypeForExtension(
.Case("hh", TY_CXXHeader)
.Case("ll", TY_LLVM_IR)

19
clang-resourcedirs.patch
View File

@ -1,18 +1,13 @@
Index: cfe-3.5.0.src/lib/Driver/Driver.cpp
Index: cfe-3.6.0.src/lib/Driver/Driver.cpp
===================================================================
--- cfe-3.5.0.src/lib/Driver/Driver.cpp
+++ cfe-3.5.0.src/lib/Driver/Driver.cpp
@@ -66,11 +66,11 @@ Driver::Driver(StringRef ClangExecutable
--- cfe-3.6.0.src/lib/Driver/Driver.cpp
+++ cfe-3.6.0.src/lib/Driver/Driver.cpp
@@ -64,7 +64,7 @@ Driver::Driver(StringRef ClangExecutable
// Compute the path to the resource directory.
StringRef ClangResourceDir(CLANG_RESOURCE_DIR);
- SmallString<128> P(Dir);
+ SmallString<128> P((Dir != "") ? Dir : "/usr/bin/");
if (ClangResourceDir != "")
+ SmallString<128> P((Dir != "") ? Dir : "/opt/clang/bin/");
if (ClangResourceDir != "") {
llvm::sys::path::append(P, ClangResourceDir);
else
- llvm::sys::path::append(P, "..", "lib", "clang", CLANG_VERSION_STRING);
+ llvm::sys::path::append(P, "..", "LLVM_LIBDIR", "clang", CLANG_VERSION_STRING);
ResourceDir = P.str();
}
} else {

3
compiler-rt-3.5.0.src.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136
size 1088352

3
compiler-rt-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f49fb79e5adcdce7dddaf973f1db130228dfb19e37a99a7f5365a6948b26b11
size 1140616

6
default-to-i586.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.5.0.src/lib/Driver/Tools.cpp
Index: cfe-3.6.0.src/lib/Driver/Tools.cpp
===================================================================
--- cfe-3.5.0.src/lib/Driver/Tools.cpp
+++ cfe-3.5.0.src/lib/Driver/Tools.cpp
--- cfe-3.6.0.src/lib/Driver/Tools.cpp
+++ cfe-3.6.0.src/lib/Driver/Tools.cpp
@@ -1322,8 +1322,8 @@ static const char *getX86TargetCPU(const
case llvm::Triple::Bitrig:
return "i686";

3
libcxx-3.5.0.src.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8045da845a63e50c201939eda8290d45e5752a9385d4d626214300d4a4d0b1c0
size 911996

3
libcxx-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:299c1e82b0086a79c5c1aa1885ea3be3bbce6979aaa9b886409b14f9b387fbb7
size 946380

13
libcxx-libdir.patch
View File

@ -1,13 +0,0 @@
Index: libcxx-3.5.0.src/lib/CMakeLists.txt
===================================================================
--- libcxx-3.5.0.src.orig/lib/CMakeLists.txt
+++ libcxx-3.5.0.src/lib/CMakeLists.txt
@@ -96,6 +96,6 @@ set_target_properties(cxx
)
install(TARGETS cxx
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
)

3
libcxxabi-3.5.0.src.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53c6be6a2dd2371f6d92c968cb8a59fbe13c6153583025433df067f706bfacd9
size 551504

3
libcxxabi-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f78bcfdb8015272f28d70f5546a544b5bdae5d92862711e8ecb9b24387d994f5
size 555924

6
libcxxabi-exceptions.patch
View File

@ -1,7 +1,7 @@
Index: libcxxabi-3.5.0.src/src/CMakeLists.txt
Index: libcxxabi-3.6.0.src/src/CMakeLists.txt
===================================================================
--- libcxxabi-3.5.0.src/src/CMakeLists.txt
+++ libcxxabi-3.5.0.src/src/CMakeLists.txt
--- libcxxabi-3.6.0.src/src/CMakeLists.txt
+++ libcxxabi-3.6.0.src/src/CMakeLists.txt
@@ -52,7 +52,7 @@ append_if(libraries LIBCXXABI_HAS_PTHREA
if (LIBCXXABI_USE_LLVM_UNWINDER)
list(APPEND libraries unwind)

3
lldb-3.5.0.src.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f98acd3a00bad8c5c85461f452bdecdd7ee87fe09917c7f924f92ddc64ff67f2
size 10147028

3
lldb-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b1ad1d42c4ea3fa2f9dd6db7c522d86e80891659b24dbb3d0d80386d8eaf0b2
size 10429916

42
lldb-cmake.patch
View File

@ -1,34 +1,8 @@
Index: lldb-3.5.0.src/source/CMakeLists.txt
Index: lldb-3.6.0.src/source/lldb.cpp
===================================================================
--- lldb-3.5.0.src.orig/source/CMakeLists.txt
+++ lldb-3.5.0.src/source/CMakeLists.txt
@@ -349,5 +349,5 @@ endif ()
install(TARGETS liblldb
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
Index: lldb-3.5.0.src/scripts/Python/modules/readline/CMakeLists.txt
===================================================================
--- lldb-3.5.0.src.orig/scripts/Python/modules/readline/CMakeLists.txt
+++ lldb-3.5.0.src/scripts/Python/modules/readline/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(readline SHARED readline.cpp
# python finds it when loading the python readline module.
set_target_properties(readline PROPERTIES
PREFIX ""
- LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY})
+ LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/${PYTHON_DIRECTORY})
# Install the readline module.
-install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON_DIRECTORY})
+install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/${PYTHON_DIRECTORY})
Index: lldb-3.5.0.src/source/lldb.cpp
===================================================================
--- lldb-3.5.0.src.orig/source/lldb.cpp
+++ lldb-3.5.0.src/source/lldb.cpp
@@ -263,11 +263,7 @@ extern "C" const unsigned char liblldb_c
--- lldb-3.6.0.src/source/lldb.cpp
+++ lldb-3.6.0.src/source/lldb.cpp
@@ -299,11 +299,7 @@ extern "C" const unsigned char liblldb_c
static const char *
GetLLDBRevision()
{
@ -40,11 +14,11 @@ Index: lldb-3.5.0.src/source/lldb.cpp
}
static const char *
Index: lldb-3.5.0.src/source/Core/IOHandler.cpp
Index: lldb-3.6.0.src/source/Core/IOHandler.cpp
===================================================================
--- lldb-3.5.0.src.orig/source/Core/IOHandler.cpp
+++ lldb-3.5.0.src/source/Core/IOHandler.cpp
@@ -29,8 +29,8 @@
--- lldb-3.6.0.src/source/Core/IOHandler.cpp
+++ lldb-3.6.0.src/source/Core/IOHandler.cpp
@@ -31,8 +31,8 @@
#include "lldb/Target/ThreadPlan.h"
#ifndef LLDB_DISABLE_CURSES

6
lldb-underlink.patch
View File

@ -1,7 +1,7 @@
Index: lldb-3.5.0.src/source/CMakeLists.txt
Index: lldb-3.6.0.src/source/CMakeLists.txt
===================================================================
--- lldb-3.5.0.src.orig/source/CMakeLists.txt
+++ lldb-3.5.0.src/source/CMakeLists.txt
--- lldb-3.6.0.src.orig/source/CMakeLists.txt
+++ lldb-3.6.0.src/source/CMakeLists.txt
@@ -161,6 +161,7 @@ set( CLANG_USED_LIBS
clangRewriteFrontend
clangSema

7
lldb.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 2 10:14:22 UTC 2015 - idonmez@suse.com
- Update to version 3.6.0
* No changelog upstream
- Remove lldb-underlink.patch, fixed upstream
-------------------------------------------------------------------
Wed Sep 17 13:26:34 UTC 2014 - idonmez@suse.com

8
lldb.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lldb
#
# 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,10 +16,10 @@
#
%define _revision 216961
%define _revision 230777
Name: lldb
Version: 3.5.0
Version: 3.6.0
Release: 0
Summary: The LLDB Debugger
License: NCSA
@ -27,7 +27,6 @@ Group: Development/Languages
Url: http://lldb.llvm.org/
Source: http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz
Patch1: lldb-cmake.patch
Patch2: lldb-underlink.patch
BuildRequires: cmake
BuildRequires: libedit-devel
BuildRequires: llvm-clang-devel = %{version}
@ -68,7 +67,6 @@ disassembler.
%prep
%setup -q -n %{name}-%{version}.src
%patch1 -p1
%patch2 -p1
sed -i s,LLDB_REVISION,\"%{_revision}\",g source/lldb.cpp

3
llvm-3.5.0.src.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03
size 11735940

3
llvm-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b39a69e501b49e8f73ff75c9ad72313681ee58d6f430bfad4d81846fe92eb9ce
size 12750908

33
llvm-config-lib64.patch
View File

@ -1,33 +0,0 @@
Index: llvm-3.5.0.src/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm-3.5.0.src.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-3.5.0.src/tools/llvm-config/llvm-config.cpp
@@ -243,16 +243,16 @@ int main(int argc, char **argv) {
case MakefileStyle:
ActivePrefix = ActiveObjRoot;
ActiveBinDir = ActiveObjRoot + "/" + build_mode + "/bin";
- ActiveLibDir = ActiveObjRoot + "/" + build_mode + "/lib";
+ ActiveLibDir = ActiveObjRoot + "/" + build_mode + "/lib64";
break;
case CMakeStyle:
ActiveBinDir = ActiveObjRoot + "/bin";
- ActiveLibDir = ActiveObjRoot + "/lib";
+ ActiveLibDir = ActiveObjRoot + "/lib64";
break;
case CMakeBuildModeStyle:
ActivePrefix = ActiveObjRoot;
ActiveBinDir = ActiveObjRoot + "/bin/" + build_mode;
- ActiveLibDir = ActiveObjRoot + "/lib/" + build_mode;
+ ActiveLibDir = ActiveObjRoot + "/lib64/" + build_mode;
break;
}
@@ -263,7 +263,7 @@ int main(int argc, char **argv) {
ActivePrefix = CurrentExecPrefix;
ActiveIncludeDir = ActivePrefix + "/include";
ActiveBinDir = ActivePrefix + "/bin";
- ActiveLibDir = ActivePrefix + "/lib";
+ ActiveLibDir = ActivePrefix + "/lib64";
ActiveIncludeOption = "-I" + ActiveIncludeDir;
}

3
llvm-docs-3.5.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d906689b868eaa289d396cd1856a6290ae1d9122696ca983304499a279c0d309
size 1385872

3
llvm-docs-3.6.0.src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62fc232bbde237214a6228958c8850ab1870a941b929962df2328f50bf0a34b5
size 3435856

6
llvm-remove-clang-only-flags.patch
View File

@ -1,7 +1,7 @@
Index: llvm-3.5.0.src/cmake/modules/HandleLLVMOptions.cmake
Index: llvm-3.6.0.src/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm-3.5.0.src.orig/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-3.5.0.src/cmake/modules/HandleLLVMOptions.cmake
--- llvm-3.6.0.src.orig/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-3.6.0.src/cmake/modules/HandleLLVMOptions.cmake
@@ -302,9 +302,6 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE
endif()
endif (LLVM_ENABLE_WARNINGS)

10
llvm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Mar 2 10:12:32 UTC 2015 - idonmez@suse.com
- 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
-------------------------------------------------------------------
Fri Feb 20 13:40:11 UTC 2015 - rguenther@suse.com

61
llvm.spec
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

6
set-revision.patch
View File

@ -1,7 +1,7 @@
Index: cfe-3.5.0.src/lib/Basic/Version.cpp
Index: cfe-3.6.0.src/lib/Basic/Version.cpp
===================================================================
--- cfe-3.5.0.src/lib/Basic/Version.cpp
+++ cfe-3.5.0.src/lib/Basic/Version.cpp
--- cfe-3.6.0.src/lib/Basic/Version.cpp
+++ cfe-3.6.0.src/lib/Basic/Version.cpp
@@ -66,19 +66,11 @@ std::string getLLVMRepositoryPath() {
}