| 1 |
commit: 1dd032e00e1cedcf7d5a3d12946965f655c3e1c9 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Sep 3 16:10:53 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 18:57:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd032e0 |
| 7 |
|
| 8 |
dev-libs/libdynd: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2234 |
| 11 |
|
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/libdynd-0.6.0-optional-cblosc.patch | 27 ---------------------- |
| 15 |
.../libdynd-0.6.0-out-of-git-versioning.patch | 14 ----------- |
| 16 |
.../files/libdynd-0.6.0-respect-libdir.patch | 15 ------------ |
| 17 |
.../libdynd-0.6.2-out-of-git-versioning.patch | 15 ------------ |
| 18 |
4 files changed, 71 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-optional-cblosc.patch b/dev-libs/libdynd/files/libdynd-0.6.0-optional-cblosc.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index d801eb6..00000000 |
| 23 |
--- a/dev-libs/libdynd/files/libdynd-0.6.0-optional-cblosc.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,27 +0,0 @@ |
| 26 |
---- CMakeLists.txt.orig 2014-02-10 14:26:48.299381259 -0800 |
| 27 |
-+++ CMakeLists.txt 2014-02-10 14:51:16.401051546 -0800 |
| 28 |
-@@ -56,8 +56,22 @@ |
| 29 |
- set(CMAKE_VERBOSE_MAKEFILE 1) |
| 30 |
- |
| 31 |
- # Embedded libraries |
| 32 |
--add_subdirectory(thirdparty/blosc) |
| 33 |
--include_directories(thirdparty/blosc/blosc) |
| 34 |
-+option(DYND_INTERNAL_CBLOSC |
| 35 |
-+ "Build and use the bundled c-blosc library" |
| 36 |
-+ OFF) |
| 37 |
-+if(DYND_INTERNAL_CBLOSC) |
| 38 |
-+ add_subdirectory(thirdparty/blosc) |
| 39 |
-+ include_directories(thirdparty/blosc/blosc) |
| 40 |
-+else() |
| 41 |
-+ find_path(CBLOSC_INCLUDE_DIR blosc.h) |
| 42 |
-+ find_library(CBLOSC_LIBRARY NAMES blosc) |
| 43 |
-+ if (CBLOSC_INCLUDE_DIR AND CBLOSC_LIBRARY) |
| 44 |
-+ message(STATUS "Found c-blosc library: ${CBLOSC_LIBRARY}") |
| 45 |
-+ else () |
| 46 |
-+ message(ERROR "No c-blosc found. Consider using internal sources.") |
| 47 |
-+ endif() |
| 48 |
-+endif(DYND_INTERNAL_CBLOSC) |
| 49 |
-+ |
| 50 |
- add_subdirectory(thirdparty/datetime) |
| 51 |
- include_directories(thirdparty/datetime/include) |
| 52 |
- |
| 53 |
|
| 54 |
diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-out-of-git-versioning.patch b/dev-libs/libdynd/files/libdynd-0.6.0-out-of-git-versioning.patch |
| 55 |
deleted file mode 100644 |
| 56 |
index 65c32da..00000000 |
| 57 |
--- a/dev-libs/libdynd/files/libdynd-0.6.0-out-of-git-versioning.patch |
| 58 |
+++ /dev/null |
| 59 |
@@ -1,14 +0,0 @@ |
| 60 |
---- CMakeLists.txt.orig 2014-02-10 14:26:48.299381259 -0800 |
| 61 |
-+++ CMakeLists.txt 2014-02-10 14:55:48.245644726 -0800 |
| 62 |
-@@ -86,9 +86,8 @@ |
| 63 |
- endif() |
| 64 |
- |
| 65 |
- # Get the git revision |
| 66 |
--include(GetGitRevisionDescriptionDyND) |
| 67 |
--get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1) |
| 68 |
--git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING --dirty --match "v[0-9]*") |
| 69 |
-+set(DYND_GIT_SHA1 "9f2e102e3b0c44da82feaa431bb89a5d71b40498") |
| 70 |
-+set(DYND_VERSION_STRING "v0.6.0") |
| 71 |
- message(STATUS "DyND version: ${DYND_VERSION_STRING}") |
| 72 |
- configure_file( |
| 73 |
- "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in" |
| 74 |
|
| 75 |
diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-respect-libdir.patch b/dev-libs/libdynd/files/libdynd-0.6.0-respect-libdir.patch |
| 76 |
deleted file mode 100644 |
| 77 |
index b363980..00000000 |
| 78 |
--- a/dev-libs/libdynd/files/libdynd-0.6.0-respect-libdir.patch |
| 79 |
+++ /dev/null |
| 80 |
@@ -1,15 +0,0 @@ |
| 81 |
---- CMakeLists.txt.orig 2014-02-10 14:26:48.299381259 -0800 |
| 82 |
-+++ CMakeLists.txt 2014-02-10 14:27:42.511704585 -0800 |
| 83 |
-@@ -481,9 +481,9 @@ |
| 84 |
- if (DYND_INSTALL_LIB) |
| 85 |
- # Install the libdynd binary |
| 86 |
- install(TARGETS libdynd |
| 87 |
-- RUNTIME DESTINATION lib |
| 88 |
-- LIBRARY DESTINATION lib |
| 89 |
-- ARCHIVE DESTINATION lib/static) |
| 90 |
-+ RUNTIME DESTINATION lib${LIB_SUFFIX} |
| 91 |
-+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
| 92 |
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}/static) |
| 93 |
- # Install the libdynd headers |
| 94 |
- install(DIRECTORY "include/dynd" DESTINATION "${CMAKE_INSTALL_PREFIX}/include") |
| 95 |
- # Install the libdynd-config script |
| 96 |
|
| 97 |
diff --git a/dev-libs/libdynd/files/libdynd-0.6.2-out-of-git-versioning.patch b/dev-libs/libdynd/files/libdynd-0.6.2-out-of-git-versioning.patch |
| 98 |
deleted file mode 100644 |
| 99 |
index 92b7ec0..00000000 |
| 100 |
--- a/dev-libs/libdynd/files/libdynd-0.6.2-out-of-git-versioning.patch |
| 101 |
+++ /dev/null |
| 102 |
@@ -1,15 +0,0 @@ |
| 103 |
---- CMakeLists.txt.orig 2014-05-01 20:43:13.000000000 +0400 |
| 104 |
-+++ CMakeLists.txt 2014-05-12 13:56:55.000000000 +0400 |
| 105 |
-@@ -112,9 +112,9 @@ |
| 106 |
- endif() |
| 107 |
- |
| 108 |
- # Get the git revision |
| 109 |
--include(GetGitRevisionDescriptionDyND) |
| 110 |
--get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_GIT_SHA1) |
| 111 |
--git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_VERSION_STRING --dirty --always --match "v*") |
| 112 |
-+SET(DYND_GIT_SHA1 "@DYND_GIT_SHA1@") |
| 113 |
-+SET(DYND_VERSION_STRING "@DYND_VERSION@") |
| 114 |
-+ |
| 115 |
- message(STATUS "DyND version: ${DYND_VERSION_STRING}") |
| 116 |
- configure_file( |
| 117 |
- "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in" |
Archives