1 |
commit: 707a3d1cfc64be2148ddb6f4dce3b5ffb9e7866c |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 2 15:47:52 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 2 15:50:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=707a3d1c |
7 |
|
8 |
dev-ml/llvm-ocaml: Remove obsolete CMAKE_BUILD_TYPE patch |
9 |
|
10 |
...ake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch | 28 ---------------------- |
11 |
dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild | 3 --- |
12 |
dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild | 3 --- |
13 |
3 files changed, 34 deletions(-) |
14 |
|
15 |
diff --git a/dev-ml/llvm-ocaml/files/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch b/dev-ml/llvm-ocaml/files/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
16 |
deleted file mode 100644 |
17 |
index 8a2c091..00000000 |
18 |
--- a/dev-ml/llvm-ocaml/files/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
19 |
+++ /dev/null |
20 |
@@ -1,28 +0,0 @@ |
21 |
-From a2ecd4815d285281cb816e06b25dc0dc2a933073 Mon Sep 17 00:00:00 2001 |
22 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
23 |
-Date: Sun, 21 Aug 2016 23:13:45 +0200 |
24 |
-Subject: [PATCH 06/10] cmake: Remove the CMAKE_BUILD_TYPE assertion |
25 |
- |
26 |
---- |
27 |
- CMakeLists.txt | 5 ----- |
28 |
- 1 file changed, 5 deletions(-) |
29 |
- |
30 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
31 |
-index 894bc8c..453fcb8 100644 |
32 |
---- a/CMakeLists.txt |
33 |
-+++ b/CMakeLists.txt |
34 |
-@@ -232,11 +232,6 @@ endif() |
35 |
- |
36 |
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) |
37 |
- |
38 |
--if (CMAKE_BUILD_TYPE AND |
39 |
-- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") |
40 |
-- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") |
41 |
--endif() |
42 |
-- |
43 |
- set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) |
44 |
- |
45 |
- set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") |
46 |
--- |
47 |
-2.9.3 |
48 |
- |
49 |
|
50 |
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild |
51 |
index d9e815d..e984d57 100644 |
52 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild |
53 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-4.0.0_rc1.ebuild |
54 |
@@ -58,9 +58,6 @@ src_prepare() { |
55 |
# Python is needed to run tests using lit |
56 |
python_setup |
57 |
|
58 |
- # Allow custom cmake build types (like 'Gentoo') |
59 |
- eapply "${FILESDIR}"/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
60 |
- |
61 |
# User patches |
62 |
eapply_user |
63 |
} |
64 |
|
65 |
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild |
66 |
index 41c9948..49f0909 100644 |
67 |
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild |
68 |
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild |
69 |
@@ -57,9 +57,6 @@ src_prepare() { |
70 |
# Python is needed to run tests using lit |
71 |
python_setup |
72 |
|
73 |
- # Allow custom cmake build types (like 'Gentoo') |
74 |
- eapply "${FILESDIR}"/llvm-cmake-Remove-the-CMAKE_BUILD_TYPE-assertion.patch |
75 |
- |
76 |
# User patches |
77 |
eapply_user |
78 |
} |