[packages/llvm] - updated patches
baggins
baggins at pld-linux.org
Sat Mar 12 20:26:05 CET 2016
commit 6461a7a9171aa23cbddff17fa2d4500dc8146271
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Mar 12 20:25:50 2016 +0100
- updated patches
debuginfo-fix.patch | 11 -----------
llvm-lld-link.patch | 8 --------
llvm-pld.patch | 4 ++--
llvm.spec | 2 --
4 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 5ad15ee..66dc10c 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -46,7 +46,6 @@ Patch0: %{name}-lld-link.patch
Patch1: %{name}-pld.patch
Patch2: libdir.patch
Patch3: x32-gcc-toolchain.patch
-Patch5: debuginfo-fix.patch
URL: http://llvm.org/
BuildRequires: bash
BuildRequires: bison
@@ -486,7 +485,6 @@ mv lld-%{version}.src tools/lld
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch5 -p1
grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
s,^#!.*bin/env python,#!%{__python},
diff --git a/debuginfo-fix.patch b/debuginfo-fix.patch
deleted file mode 100644
index 72ad371..0000000
--- a/debuginfo-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm-3.7.0.src/include/llvm/CodeGen/CommandFlags.h~ 2015-07-06 19:44:26.000000000 +0200
-+++ llvm-3.7.0.src/include/llvm/CodeGen/CommandFlags.h 2015-10-11 11:59:10.130862977 +0200
-@@ -21,7 +21,7 @@
- #include "llvm/IR/Intrinsics.h"
- #include "llvm/IR/Module.h"
- #include "llvm/MC/MCTargetOptionsCommandFlags.h"
--#include "llvm//MC/SubtargetFeature.h"
-+#include "llvm/MC/SubtargetFeature.h"
- #include "llvm/Support/CodeGen.h"
- #include "llvm/Support/CommandLine.h"
- #include "llvm/Support/Host.h"
diff --git a/llvm-lld-link.patch b/llvm-lld-link.patch
index 631898d..ef90e1e 100644
--- a/llvm-lld-link.patch
+++ b/llvm-lld-link.patch
@@ -35,14 +35,6 @@
)
include_directories(.)
---- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/PECOFF/CMakeLists.txt.orig 2015-02-20 23:10:28.000000000 +0100
-+++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/PECOFF/CMakeLists.txt 2015-10-01 21:51:35.921762208 +0200
-@@ -13,4 +13,5 @@
- lldCore
- LLVMObject
- LLVMSupport
-+ pthread
- )
--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/ELF/CMakeLists.txt.orig 2015-05-22 18:01:12.000000000 +0200
+++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/ELF/CMakeLists.txt 2015-10-02 15:51:47.415199842 +0200
@@ -17,6 +17,7 @@
diff --git a/llvm-pld.patch b/llvm-pld.patch
index b93a348..17406c1 100644
--- a/llvm-pld.patch
+++ b/llvm-pld.patch
@@ -51,14 +51,14 @@
DebianSqueeze,
DebianWheezy,
@@ -2820,6 +2824,10 @@
- return Distro >= UbuntuHardy && Distro <= UbuntuTrusty;
+ return Distro >= UbuntuHardy && Distro <= UbuntuXenial;
}
+static bool IsPLD(enum Distro Distro) {
+ return Distro == PLDLinux;
+}
+
- static Distro DetectDistro(llvm::Triple::ArchType Arch) {
+ static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) {
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
llvm::MemoryBuffer::getFile("/etc/lsb-release");
@@ -2888,6 +2896,9 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/6461a7a9171aa23cbddff17fa2d4500dc8146271
More information about the pld-cvs-commit
mailing list