diff options
3 files changed, 1 insertions, 40 deletions
diff --git a/dev-util/cpp-dependency-analyzer/Manifest b/dev-util/cpp-dependency-analyzer/Manifest index d3c71e05695..e1ec348e7ee 100644 --- a/dev-util/cpp-dependency-analyzer/Manifest +++ b/dev-util/cpp-dependency-analyzer/Manifest @@ -1,3 +1,2 @@ -AUX cpp-dependency-analyzer-9999-multilib.patch 1377 RMD160 a8f6ae4db048506bfd0ee250c753bd065db0f763 SHA1 ed183beec5a221e3a004f09fb7d2b4953b8e541d SHA256 8934dac94e2966927995c0479b9b69c9b089196b33dcce4c191d28d1866eb287 -EBUILD cpp-dependency-analyzer-9999.ebuild 597 RMD160 7877d05bb2178b1c29ffa7b0aa8867ec4ae0af84 SHA1 bb50c8e692ec29bb929d2a10f31380195b59b4e8 SHA256 c8d2f354cc8da4faa532e6b954fd5279bf66bb3fe3c079c6b74308be25916bde +EBUILD cpp-dependency-analyzer-9999.ebuild 549 RMD160 24b0686376aaa421e70c6e0146e61f924d9d5e38 SHA1 fb408acc3391fec45b238c7c0c2f4dcb67a13d2d SHA256 c50c7213dd83a86e33b2028655622f82fee637a8284a754ab2361652e6e63655 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 diff --git a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild index d88a508d8f5..6e1c7ffa612 100644 --- a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild +++ b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild @@ -25,10 +25,6 @@ DEPEND="${RDEPEND} >=dev-libs/boost-1.35.0 " -PATCHES=( - "${FILESDIR}/${P}-multilib.patch" -) - src_unpack() { git_src_unpack } diff --git a/dev-util/cpp-dependency-analyzer/files/cpp-dependency-analyzer-9999-multilib.patch b/dev-util/cpp-dependency-analyzer/files/cpp-dependency-analyzer-9999-multilib.patch deleted file mode 100644 index 46c65d23b3b..00000000000 --- a/dev-util/cpp-dependency-analyzer/files/cpp-dependency-analyzer-9999-multilib.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dd2c31..a6d8467 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,8 @@ project(FactExtractor) - - cmake_minimum_required(VERSION 2.6) - -+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") -+ - if (CMAKE_COMPILER_IS_GNUCXX) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common -pedantic-errors") - if (NOT MINGW) -diff --git a/libs/compilerprofile/CMakeLists.txt b/libs/compilerprofile/CMakeLists.txt -index 97a46cb..b081cbb 100644 ---- a/libs/compilerprofile/CMakeLists.txt -+++ b/libs/compilerprofile/CMakeLists.txt -@@ -21,4 +21,4 @@ set_target_properties(compilerprofile PROPERTIES - DEFINE_SYMBOL MAKE_CPP_COMPILERPROFILE_LIB - ) - --install(TARGETS compilerprofile DESTINATION lib) -+install(TARGETS compilerprofile DESTINATION lib${LIB_SUFFIX}) -diff --git a/libs/project/CMakeLists.txt b/libs/project/CMakeLists.txt -index 1299860..3c04bf7 100644 ---- a/libs/project/CMakeLists.txt -+++ b/libs/project/CMakeLists.txt -@@ -22,5 +22,5 @@ set_target_properties(project PROPERTIES - DEFINE_SYMBOL MAKE_CPP_PROJECT_LIB - ) - --install(TARGETS project DESTINATION lib) -+install(TARGETS project DESTINATION lib${LIB_SUFFIX}) - |