[packages/llvm] - updated libdir patch wrt. ocaml, added lld-link patches; now builds on x86_64
qboosh
qboosh at pld-linux.org
Sat Oct 3 22:20:06 CEST 2015
commit 3c402b7e5184df8779b3adc9e6780c7cdd1ade00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 3 22:21:08 2015 +0200
- updated libdir patch wrt. ocaml, added lld-link patches; now builds on x86_64
libdir.patch | 34 +++++++++++++++++++++++++++++++++
llvm-lld-link.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
llvm.spec | 28 ++++++++++++++++-----------
3 files changed, 106 insertions(+), 11 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 2a03827..7390074 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -41,6 +41,7 @@ Source5: http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.ta
# Source5-md5: d5a87dacb65d981a427a536f6964642e
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
@@ -435,6 +436,7 @@ mv cfe-%{version}.src tools/clang
mv clang-tools-extra-%{version}.src tools/clang/tools/extra
mv lld-%{version}.src tools/lld
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -455,13 +457,6 @@ mv lld-%{version}.src tools/lld
# tools/clang/runtime/compiler-rt/Makefile
%{__sed} -i 's|"lib"|"%{_lib}"|' tools/clang/lib/Driver/Driver.cpp
-%ifarch x32
-%{__sed} -i 's|@LLVM_LIBDIR_SUFFIX@|x32|' tools/llvm-config/BuildVariables.inc.in
-%endif
-%ifarch %{x8664}
-%{__sed} -i 's|@LLVM_LIBDIR_SUFFIX@|64|' tools/llvm-config/BuildVariables.inc.in
-%endif
-
grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
s,^#!.*bin/env python,#!%{__python},
s,^#!.*bin/env perl,#!%{__perl},
@@ -491,8 +486,6 @@ install -d build
# Disabling assertions now, rec. by pure and needed for OpenGTL
# TESTFIX no PIC on ix86: http://llvm.org/bugs/show_bug.cgi?id=3801
-#
-# bash specific 'test a < b'
cd build
CPPFLAGS="%{rpmcppflags} -D_FILE_OFFSET_BITS=64"
@@ -639,6 +632,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/llvm-extract
%attr(755,root,root) %{_bindir}/llvm-lib
%attr(755,root,root) %{_bindir}/llvm-link
+%ifarch %{x8664} x32
+%attr(755,root,root) %{_bindir}/llvm-lto
+%endif
%attr(755,root,root) %{_bindir}/llvm-mc
%attr(755,root,root) %{_bindir}/llvm-mcmarkup
%attr(755,root,root) %{_bindir}/llvm-nm
@@ -686,6 +682,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libLLVM*.so.%{version}
%attr(755,root,root) %ghost %{_libdir}/libLLVM*.so.3.7
+%ifarch %{x8664} x32
+%attr(755,root,root) %{_libdir}/libLTO.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libLTO.so.3.7
+%endif
%files devel
%defattr(644,root,root,755)
@@ -694,7 +694,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/BugpointPasses.so
%ifarch %{x8664} x32
%attr(755,root,root) %{_libdir}/libLTO.so
-%{_libdir}/libLTO.a
%endif
%{_includedir}/llvm
%{_includedir}/llvm-c
@@ -743,8 +742,13 @@ rm -rf $RPM_BUILD_ROOT
%if %{with rt}
%{_libdir}/clang/%{version}/lib
%{_libdir}/clang/%{version}/asan_blacklist.txt
+%ifarch %{x8664} x32
+%{_libdir}/clang/%{version}/dfsan_abilist.txt
+%{_libdir}/clang/%{version}/msan_blacklist.txt
+%endif
%endif
-#%{_mandir}/man1/clang.1*
+%dir %{_datadir}/clang
+%{_datadir}/clang/clang-format-diff.py
%files -n clang-analyzer
%defattr(644,root,root,755)
@@ -767,7 +771,9 @@ rm -rf $RPM_BUILD_ROOT
%files -n clang-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libclang*.so
+%ifarch %{ix86} # ???
%{_libdir}/libclang.a
+%endif
%{_includedir}/clang
%{_includedir}/clang-c
diff --git a/libdir.patch b/libdir.patch
index ecb2ffc..a424c75 100644
--- a/libdir.patch
+++ b/libdir.patch
@@ -9,3 +9,37 @@
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
endmacro(add_polly_library)
+--- llvm-3.7.0.src/bindings/ocaml/llvm/CMakeLists.txt.orig 2014-12-30 04:24:07.000000000 +0100
++++ llvm-3.7.0.src/bindings/ocaml/llvm/CMakeLists.txt 2015-10-03 17:47:47.253164926 +0200
+@@ -8,4 +8,4 @@
+ "${LLVM_LIBRARY_DIR}/ocaml/META.llvm")
+
+ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
+- DESTINATION lib/ocaml)
++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
+--- llvm-3.7.0.src/bindings/ocaml/backends/CMakeLists.txt.orig 2014-12-30 04:24:07.000000000 +0100
++++ llvm-3.7.0.src/bindings/ocaml/backends/CMakeLists.txt 2015-10-03 17:48:57.483480254 +0200
+@@ -23,5 +23,5 @@
+ "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}")
+
+ install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
+- DESTINATION lib/ocaml)
++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
+ endforeach()
+--- llvm-3.7.0.src/cmake/modules/AddOCaml.cmake.orig 2015-06-07 21:22:22.000000000 +0200
++++ llvm-3.7.0.src/cmake/modules/AddOCaml.cmake 2015-10-03 18:13:42.583970785 +0200
+@@ -183,12 +183,12 @@
+ endforeach()
+
+ install(FILES ${install_files}
+- DESTINATION lib/ocaml)
++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
+ install(FILES ${install_shlibs}
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE
+ WORLD_READ WORLD_EXECUTE
+- DESTINATION lib/ocaml)
++ DESTINATION lib${LLVM_LIBDIR_SUFFIX}/ocaml)
+
+ foreach( install_file ${install_files} ${install_shlibs} )
+ get_filename_component(filename "${install_file}" NAME)
diff --git a/llvm-lld-link.patch b/llvm-lld-link.patch
new file mode 100644
index 0000000..631898d
--- /dev/null
+++ b/llvm-lld-link.patch
@@ -0,0 +1,55 @@
+--- llvm-3.7.0.src/tools/lld/lib/Core/CMakeLists.txt.orig 2015-01-21 23:54:56.000000000 +0100
++++ llvm-3.7.0.src/tools/lld/lib/Core/CMakeLists.txt 2015-10-01 20:22:26.497622590 +0200
+@@ -8,5 +8,5 @@ add_llvm_library(lldCore
+ SymbolTable.cpp
+ Writer.cpp
+ LINK_LIBS
+- LLVMSupport
++ LLVMSupport pthread
+ )
+--- llvm-3.7.0.src/tools/lld/lib/Driver/CMakeLists.txt.orig 2015-06-23 21:54:57.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/Driver/CMakeLists.txt 2015-10-01 20:22:45.881962494 +0200
+@@ -37,6 +37,7 @@ add_llvm_library(lldDriver
+ LLVMObject
+ LLVMOption
+ LLVMSupport
++ pthread
+ )
+
+ add_dependencies(lldDriver DriverOptionsTableGen)
+--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/CMakeLists.txt.orig 2015-04-10 23:23:51.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/CMakeLists.txt 2015-10-01 20:22:59.195987185 +0200
+@@ -16,4 +16,5 @@ add_llvm_library(lldReaderWriter
+ lldYAML
+ LLVMObject
+ LLVMSupport
++ pthread
+ )
+--- llvm-3.7.0.src/tools/lld/lib/ReaderWriter/MachO/CMakeLists.txt.orig 2015-06-23 22:35:31.000000000 +0200
++++ llvm-3.7.0.src/tools/lld/lib/ReaderWriter/MachO/CMakeLists.txt 2015-10-01 21:51:16.757434595 +0200
+@@ -22,6 +22,7 @@
+ lldYAML
+ LLVMObject
+ LLVMSupport
++ pthread
+ )
+
+ 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 @@
+ lldYAML
+ LLVMObject
+ LLVMSupport
++ pthread
+ )
+
+ include_directories(.)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/3c402b7e5184df8779b3adc9e6780c7cdd1ade00
More information about the pld-cvs-commit
mailing list