- removed unused patches (build system switched to cmake)

diff --git a/build-lld.patch b/build-lld.patch
deleted file mode 100644 (file)
index 7f089eb..0000000
--- a/build-lld.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- llvm-3.7.0.src/tools/Makefile.old  2014-12-12 18:31:24.000000000 +0100
-+++ llvm-3.7.0.src/tools/Makefile      2015-06-08 06:04:13.000000000 +0200
-@@ -19,8 +19,9 @@
-   OPTIONAL_PARALLEL_DIRS := clang
- endif
- 
--# Build LLDB if present. Note LLDB must be built last as it depends on
-+# Build LLD and LLDB if present. Note LLDB must be built last as it depends on
- # the wider LLVM infrastructure (including Clang).
-+OPTIONAL_PARALLEL_DIRS += lld
- OPTIONAL_DIRS := lldb
- 
- # NOTE: The tools are organized into five groups of four consisting of one

diff --git a/llvm-2.6-timestamp.patch b/llvm-2.6-timestamp.patch
deleted file mode 100644 (file)
index ab0979e..0000000
--- a/llvm-2.6-timestamp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm-2.6/Makefile.rules.timestamp  2009-08-19 18:04:44.000000000 -0400
-+++ llvm-2.6/Makefile.rules    2009-09-09 02:10:38.287389725 -0400
-@@ -672,7 +672,7 @@
- 
- ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755
- ScriptInstall = $(INSTALL) -m 0755
--DataInstall   = $(INSTALL) -m 0644
-+DataInstall   = $(INSTALL) -p -m 0644
- 
- # When compiling under Mingw/Cygwin, the tblgen tool expects Windows
- # paths. In this case, the SYSPATH function (defined in

diff --git a/llvm-lldb-atomic.patch b/llvm-lldb-atomic.patch
deleted file mode 100644 (file)
index 510864b..0000000
--- a/llvm-lldb-atomic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm-3.5.0.src/tools/lldb/lib/Makefile.orig        2014-07-21 19:24:05.000000000 +0200
-+++ llvm-3.5.0.src/tools/lldb/lib/Makefile     2014-10-19 22:11:21.104592254 +0200
-@@ -173,7 +173,7 @@
-     # Don't allow unresolved symbols.
-     LLVMLibsOptions += -Wl,--no-undefined
-     # Link in python
--    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel
-+    LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -latomic
-     LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
- endif
- 

diff --git a/llvm-lldb.patch b/llvm-lldb.patch
deleted file mode 100644 (file)
index 0b4ee39..0000000
--- a/llvm-lldb.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- llvm-3.5.0.src/tools/lldb/Makefile.orig    2014-03-12 11:35:00.000000000 +0100
-+++ llvm-3.5.0.src/tools/lldb/Makefile 2014-10-04 08:18:52.270545688 +0200
-@@ -41,6 +41,8 @@
- # Disable python and curses on mingw build
- ifeq ($(HOST_OS),MingW)
- CXXFLAGS += -DLLDB_DISABLE_PYTHON -DLLDB_DISABLE_CURSES
-+else
-+CPP.Flags += -I/usr/include/ncurses
- endif
- 
- ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
---- llvm-3.5.0.src/tools/lldb/scripts/Python/modules/readline/Makefile.orig    2014-02-26 16:05:48.000000000 +0100
-+++ llvm-3.5.0.src/tools/lldb/scripts/Python/modules/readline/Makefile 2014-10-18 20:28:35.057301669 +0200
-@@ -91,9 +91,9 @@
- # Target to move the shared library from the build python lib dir to
- # the install python lib dir.
- install-local:: $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)
--      $(Echo) Installing $(BuildMode) $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to $(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)
--      $(Verb) $(MKDIR) "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)"
--      $(Verb) $(ProgInstall) "$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)" "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)"
--      $(Verb) $(RM) "$(DESTDIR)$(prefix)/lib/$(LIBRARYNAME)$(SHLIBEXT)"
-+      $(Echo) Installing $(BuildMode) $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to $(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)
-+      $(Verb) $(MKDIR) "$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)"
-+      $(Verb) $(ProgInstall) "$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)" "$(DESTDIR)$(PROJ_libdir)/$(LLDB_PYTHON_MODULE_REL_DIR)"
-+      $(Verb) $(RM) "$(DESTDIR)$(PROJ_libdir)/$(LIBRARYNAME)$(SHLIBEXT)"
- 
- endif  # if !defined(LLDB_DISABLE_PYTHON)

diff --git a/llvm.spec b/llvm.spec
index 002614e769489bd8aa6fe5488299074f3c128155..dd65f8ceea4593a0180457ca706014bef66a7716 100644 (file)
--- a/llvm.spec
+++ b/llvm.spec
@@ -42,12 +42,7 @@ Source5:     http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.ta
 Source6:       http://llvm.org/releases/%{version}/lld-%{version}.src.tar.xz
 # Source6-md5: 91bd593a67293d84dad0bf11845546c2
 Patch0:                %{name}-lld-link.patch
-# Data files should be installed with timestamps preserved
-Patch1:                %{name}-2.6-timestamp.patch
 Patch2:                %{name}-pld.patch
-Patch3:                build-lld.patch
-Patch4:                %{name}-lldb.patch
-Patch5:                %{name}-lldb-atomic.patch
 Patch6:                libdir.patch
 Patch7:                x32-gcc-toolchain.patch
 Patch8:                gcc5.patch
@@ -440,15 +435,7 @@ mv clang-tools-extra-%{version}.src tools/clang/tools/extra
 mv lld-%{version}.src tools/lld
 
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%if %{with lldb}
-%patch4 -p1
-%ifarch i386 i486
-%patch5 -p1
-%endif
-%endif
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1