mir/MEGAcmd
2
0
Fork 0
mirror of https://github.com/meganz/MEGAcmd synced 2025-08-22 01:47:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'task/CMD-628_disable_fuse_for_32bit_builds_tmp_force_fatal_error' into 'release/v2.1.0'

Browse Source 
[CMD-628] Disable FUSE in 32 bit builds [to release/v2.1.0]

See merge request apps/MEGAcmd!893
This commit is contained in:
Pablo M 2025-03-25 19:46:50 +13:00
commit cf5d2b9331
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/cmake/modules/megacmd_options.cmake
View File

@ -41,8 +41,24 @@ endif()
#Override SDK's options:
option(ENABLE_ISOLATED_GFX "Turns on isolated GFX processor" OFF)
option(ENABLE_SDKLIB_WERROR "Enable warnings as errors" OFF)
if(UNIX AND NOT APPLE)
option(WITH_FUSE "Build with FUSE support." ON)
execute_process(
COMMAND uname -m
OUTPUT_VARIABLE SYSTEM_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
message(STATUS "System Architecture: <${SYSTEM_ARCHITECTURE}>")
if(SYSTEM_ARCHITECTURE MATCHES "^(i[3-6]86|x86|armhf|armv7l)$")
set(IS_32_BIT ON)
else()
set(IS_32_BIT OFF)
endif()
if(NOT IS_32_BIT)
message(STATUS "Configuring with FUSE support")
option(WITH_FUSE "Build with FUSE support." ON)
endif()
endif()
if(WITH_FUSE)

10
build/create_tarball.sh
View File

@ -41,6 +41,16 @@ for dscFile in `find templates/megacmd/ -name megacmd-xUbuntu_* -o -name megacmd
sed -e "s/megacmd_VERSION/$megacmd_VERSION/g" "${dscFile}" > megacmd/`basename ${dscFile}`
done
# Adjustments to remove fuse dependency for 32 bits builds
if pwd | grep -E "/(i[3-6]86|x86|armhf|armv7l)/" >/dev/null; then
echo "Removing fuse dependency...."
sed -i "/libfuse-dev/d" megacmd/debian.control
sed -i "s#, fuse##g" megacmd/debian.control
sed -i "/fuse/d" megacmd/megacmd.spec
sed -i "s#, libfuse-dev##g" megacmd/megacmd.dsc
sed -i "s# 'fuse2'##g" megacmd/PKGBUILD
fi
# read the last generated ChangeLog version
version_file="version"