Resolve "make user library compilation optional and update ARM support"

Ramon Nourequested to merge
rnou/330-make-user-library-compilation-optional into master

Closes #330 (closed)

Merge request reports

CMake/gkfs-options.cmake

+6 −0
Changes for CMake/gkfs-options.cmake: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -234,6 +234,12 @@ gkfs_define_option( 
    DEFAULT_VALUE OFF

)



#build user_lib

gkfs_define_option(

    GKFS_BUILD_USER_LIB

    HELP_TEXT "Compile user lib"

    DEFAULT_VALUE ON

)



# use old resolve function

gkfs_define_option(

examples/user_library/CMakeLists.txt

+2 −0
Changes for examples/user_library/CMakeLists.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
################################################################################



set(CMAKE_CXX_STANDARD 17)

if (GKFS_BUILD_USER_LIB)

add_executable(gkfs_lib_example gkfs_lib_example.cpp)



target_link_libraries(gkfs_lib_example
@@ -37,3 +38,4 @@ if (GKFS_INSTALL_TESTS) 
        DESTINATION ${CMAKE_INSTALL_BINDIR}

    )

endif ()

endif ()
 
 No newline at end of file

include/client/CMakeLists.txt

+2 −0
Changes for include/client/CMakeLists.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ target_sources( 
    syscalls/detail/syscall_info.h

)



if (GKFS_BUILD_USER_LIB)

target_sources(

    gkfs_user_lib

    PUBLIC gkfs_functions.hpp
@@ -84,3 +85,4 @@ target_sources( 
    void_syscall_intercept.hpp

    user_functions.hpp

)

endif()
 
 No newline at end of file

scripts/profiles/0.9.4/install/syscall_intercept.install

+1 −0
Changes for scripts/profiles/0.9.4/install/syscall_intercept.install: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ pkg_install() { 
    -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \

    -DCMAKE_BUILD_TYPE:STRING=Debug \

    -DBUILD_EXAMPLES:BOOL=OFF \

    -DSTATIC_CAPSTONE:BOOL=OFF \

    -DBUILD_TESTS:BOOK=OFF ..

    make -j"${CORES}" install

    if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then

scripts/profiles/0.9.4/arm.specs

+1 −1
Changes for scripts/profiles/0.9.4/arm.specs: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ clonedeps=( 
    ["libfabric"]="HEAD@v1.20.1"

    ["mercury"]="v2.4.0"

    ["margo"]="v0.18.3"

    ["syscall_intercept"]="34a41033fce94195700c5ab1e097f40741d7f016"

    ["syscall_intercept"]="88043bdbbc60801d4fbe0076962ed1a766ba4800"

)



# Extra arguments for git clone