jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "build-style/cmake.sh: Use -DCMAKE_BUILD_TYPE=RelWithDebInfo when having XBPS_DEBUG_PKGS set"

Browse source 
This reverts commit 6638dc5526.

Setting RelWithDebInfo can cause issues since cmake macros often handle
only Release or Debug build but not RelWithDebInf which might cause
issues https://github.com/void-linux/void-packages/pull/10948

It is advised to set -DCMAKE_BUILD_TYPE=RelWithDebInfo manually in
packages that ignore our CFLAGS or patch them to use them

closes #10948
This commit is contained in:
John 2019-04-15 04:22:43 +02:00
parent d40e537399
commit 851a83b478
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/build-style/cmake.sh
View file

@ -43,12 +43,7 @@ _EOF
cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake"
fi fi
cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr"
cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
if [ -n "$XBPS_DEBUG_PKGS" ] && [ -z $nodebug ]; then
cmake_args+=" -DCMAKE_BUILD_TYPE=RelWithDebInfo"
else
cmake_args+=" -DCMAKE_BUILD_TYPE=Release"
fi
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib32" cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib32"