[packages/llvm] libdir.patch split in two, so polly bcond works
jajcus
jajcus at pld-linux.org
Wed Nov 2 14:13:57 CET 2016
commit 8f30244eaada667599810559a25a90c013549456
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Oct 28 09:59:01 2016 +0200
libdir.patch split in two, so polly bcond works
libdir-polly.patch | 12 ++++++++++++
libdir.patch | 11 -----------
llvm.spec | 4 ++++
3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index f0d3cc4..9261e2e 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -49,6 +49,7 @@ Patch2: libdir.patch
Patch3: x32-gcc-toolchain.patch
Patch4: cmake-buildtype.patch
Patch5: %{name}-ocaml-shared.patch
+Patch6: libdir-polly.patch
URL: http://llvm.org/
BuildRequires: bash
BuildRequires: bison
@@ -497,6 +498,9 @@ Dokumentacja HTML wiązania OCamla do LLVM-a.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%if %{with polly}
+%patch6 -p1
+%endif
grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
s,^#!.*bin/env python,#!%{__python},
diff --git a/libdir-polly.patch b/libdir-polly.patch
new file mode 100644
index 0000000..56be78e
--- /dev/null
+++ b/libdir-polly.patch
@@ -0,0 +1,12 @@
+--- llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake~ 2015-06-29 21:57:59.000000000 +0200
++++ llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake 2015-09-09 21:36:43.080128117 +0200
+@@ -46,7 +46,7 @@
+ endif(MSVC)
+ install(TARGETS ${name}
+ EXPORT LLVMExports
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+ set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
+ endmacro(add_polly_library)
+
diff --git a/libdir.patch b/libdir.patch
index a424c75..9fefe00 100644
--- a/libdir.patch
+++ b/libdir.patch
@@ -1,14 +1,3 @@
---- llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake~ 2015-06-29 21:57:59.000000000 +0200
-+++ llvm-3.7.0.src/tools/polly/cmake/polly_macros.cmake 2015-09-09 21:36:43.080128117 +0200
-@@ -46,7 +46,7 @@
- endif(MSVC)
- install(TARGETS ${name}
- EXPORT LLVMExports
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
- 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 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/80d95ac67fa242a5d156b5f4823ab36a2bc49151
More information about the pld-cvs-commit
mailing list