From 52d59f698853bc647ce64a093ce151d06d0c0621 Mon Sep 17 00:00:00 2001 From: blshkv Date: Tue, 19 Feb 2019 21:59:30 +0800 Subject: [PATCH] capstone: commit a better patch --- dev-libs/capstone/capstone-4.0.1-r1.ebuild | 2 +- dev-libs/capstone/files/capstone-cmake.patch | 27 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 dev-libs/capstone/files/capstone-cmake.patch diff --git a/dev-libs/capstone/capstone-4.0.1-r1.ebuild b/dev-libs/capstone/capstone-4.0.1-r1.ebuild index 3aece3e1b..7f9c540ea 100644 --- a/dev-libs/capstone/capstone-4.0.1-r1.ebuild +++ b/dev-libs/capstone/capstone-4.0.1-r1.ebuild @@ -20,6 +20,6 @@ DEPEND="${RDEPEND}" #TODO: add java and ocaml bindings src_prepare() { - sed -i "s|lib/|lib\${LIBSUFFIX}/|" CMakeLists.txt || die + eapply ${FILESDIR}/capstone-cmake.patch cmake-utils_src_prepare } diff --git a/dev-libs/capstone/files/capstone-cmake.patch b/dev-libs/capstone/files/capstone-cmake.patch new file mode 100644 index 000000000..fd0e6e5c3 --- /dev/null +++ b/dev-libs/capstone/files/capstone-cmake.patch @@ -0,0 +1,27 @@ +--- a/CMakeLists.txt.orig 2019-01-10 21:45:56.000000000 +0800 ++++ b/CMakeLists.txt 2019-02-19 21:56:11.651398683 +0800 +@@ -576,15 +576,9 @@ + source_group("Include\\EVM" FILES ${HEADERS_EVM}) + + ### test library 64bit routine: +-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) ++include("GNUInstallDirs") + +-if (NOT APPLE AND "${LIB64}" STREQUAL "TRUE") +- set(LIBSUFFIX 64) +-else() +- set(LIBSUFFIX "") +-endif() +- +-set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") ++set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") + mark_as_advanced(INSTALL_LIB_DIR) + + ## installation +@@ -611,5 +605,5 @@ + target_link_libraries(cstool ${default-target}) + + install(TARGETS cstool DESTINATION bin) +-install(FILES ${CMAKE_BINARY_DIR}/capstone.pc DESTINATION lib/pkgconfig) ++install(FILES ${CMAKE_BINARY_DIR}/capstone.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif ()