diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-12-13 13:25:33 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-12-13 15:05:28 +0100 |
| commit | 17bad73aea37d3a55e0cdff3e7e01117ea24773e (patch) | |
| tree | 91bcec7a325eb80bc060ded736259f80aa6804aa | |
| parent | dev-python/sqlalchemy: Version Bump (diff) | |
| download | gentoo-17bad73aea37d3a55e0cdff3e7e01117ea24773e.tar.gz gentoo-17bad73aea37d3a55e0cdff3e7e01117ea24773e.tar.bz2 gentoo-17bad73aea37d3a55e0cdff3e7e01117ea24773e.zip | |
sci-biology/bamtools: Add missing die and drop old patch
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec@gentoo.org>
| -rw-r--r-- | sci-biology/bamtools/bamtools-2.3.0.ebuild | 4 | ||||
| -rw-r--r-- | sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch | 32 |
2 files changed, 3 insertions, 33 deletions
diff --git a/sci-biology/bamtools/bamtools-2.3.0.ebuild b/sci-biology/bamtools/bamtools-2.3.0.ebuild index 5b6468c6f6a2..b2d7d623f900 100644 --- a/sci-biology/bamtools/bamtools-2.3.0.ebuild +++ b/sci-biology/bamtools/bamtools-2.3.0.ebuild @@ -25,5 +25,7 @@ PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) src_install() { cmake-utils_src_install - use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/*.a || die + fi } diff --git a/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch b/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch deleted file mode 100644 index 318396e75c36..000000000000 --- a/sci-biology/bamtools/files/bamtools-2.2.3-unbundle.patch +++ /dev/null @@ -1,32 +0,0 @@ - src/CMakeLists.txt | 1 - - src/api/CMakeLists.txt | 4 ++-- - src/toolkit/bamtools_filter.cpp | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e359695..2bd2185 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -6,7 +6,6 @@ - # ========================== - - add_subdirectory( api ) --add_subdirectory( third_party ) - add_subdirectory( toolkit ) - add_subdirectory( utils ) - -diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt -index 66eb35f..65f4639 100644 ---- a/src/api/CMakeLists.txt -+++ b/src/api/CMakeLists.txt -@@ -54,8 +54,8 @@ target_link_libraries( BamTools ${APILibs} ) - target_link_libraries( BamTools-static ${APILibs} ) - - # set library install destinations --install( TARGETS BamTools LIBRARY DESTINATION "lib/bamtools" RUNTIME DESTINATION "bin") --install( TARGETS BamTools-static ARCHIVE DESTINATION "lib/bamtools") -+install( TARGETS BamTools LIBRARY DESTINATION "lib${LIB_SUFFIX}" RUNTIME DESTINATION "bin") -+install( TARGETS BamTools-static ARCHIVE DESTINATION "lib${LIB_SUFFIX}") - - # export API headers - include(../ExportHeader.cmake) |