diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2017-07-31 17:16:53 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-08-05 07:07:26 +0700 |
| commit | f74811213b228cc7dfd461e3763341bf273a7d3d (patch) | |
| tree | 87f4e69758daa635a3681c511cbb293c6f65ee0f /system/capstone | |
| parent | 4a0666deb837a8a86f3b029a77be51864b34ba76 (diff) | |
system/capstone: Fixed build on 32 bit.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'system/capstone')
| -rw-r--r-- | system/capstone/CMakeLists.txt.patch | 31 | ||||
| -rw-r--r-- | system/capstone/capstone.SlackBuild | 1 |
2 files changed, 7 insertions, 25 deletions
diff --git a/system/capstone/CMakeLists.txt.patch b/system/capstone/CMakeLists.txt.patch index 123c94bd83e3..2107c99d1c3a 100644 --- a/system/capstone/CMakeLists.txt.patch +++ b/system/capstone/CMakeLists.txt.patch @@ -1,32 +1,13 @@ --- CMakeLists.txt 2017-04-17 07:31:11.000000000 -0600 -+++ CMakeLists_new.txt 2017-07-16 19:39:43.597509953 -0600 -@@ -460,21 +460,34 @@ - source_group("Include\\M68K" FILES ${HEADERS_M68K}) - source_group("Include\\TMS320C64x" FILES ${HEADERS_TMS320C64X}) - -+### test library 64bit routine: -+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) -+ -+if ("${LIB64}" STREQUAL "TRUE") -+ set(LIBSUFFIX 64) -+else() -+ set(LIBSUFFIX "") -+endif() -+ -+set(INSTALL_LIB_DIR lib${LIBSUFFIX} CACHE PATH "Installation directory for libraries") -+mark_as_advanced(INSTALL_LIB_DIR) -+ -+ - ## installation - install(FILES ${HEADERS_COMMON} DESTINATION include/capstone) - ++++ CMakeLists_new.txt 2017-07-31 17:02:55.478190634 +0100 +@@ -466,15 +466,15 @@ if (CAPSTONE_BUILD_STATIC) install(TARGETS capstone-static RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION ${INSTALL_LIB_DIR} -+ ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) endif () if (CAPSTONE_BUILD_SHARED) @@ -34,8 +15,8 @@ RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION ${INSTALL_LIB_DIR} -+ ARCHIVE DESTINATION ${INSTALL_LIB_DIR}) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) endif () if (CAPSTONE_BUILD_SHARED) diff --git a/system/capstone/capstone.SlackBuild b/system/capstone/capstone.SlackBuild index faf4fa30702c..23b45342e13a 100644 --- a/system/capstone/capstone.SlackBuild +++ b/system/capstone/capstone.SlackBuild @@ -81,6 +81,7 @@ cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="$LIBDIRSUFFIX" \ -DCAPSTONE_ARM_SUPPORT=1 \ -DCAPSTONE_ARM64_SUPPORT=1 \ -DCAPSTONE_M68K_SUPPORT=1 \ |