Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-24 10:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

system/capstone: Fixed build on 32 bit.

Browse source 
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
David Spencer 2017-07-31 17:16:53 +01:00 committed by Willy Sudiarto Raharjo
parent 4a0666deb8
commit f74811213b
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
system/capstone/CMakeLists.txt.patch
View file

@ -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)

1
system/capstone/capstone.SlackBuild
View file

@ -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 \