From 851a83b47896b7e24d23428d4a9a5bc9ae07ed5c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 15 Apr 2019 04:22:43 +0200 Subject: [PATCH] Revert "build-style/cmake.sh: Use -DCMAKE_BUILD_TYPE=RelWithDebInfo when having XBPS_DEBUG_PKGS set" This reverts commit 6638dc55268eed63b3bfd7a65f0eb9450054a586. 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 --- common/build-style/cmake.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 1260fb46e0d..fee1f4ec2d0 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -43,12 +43,7 @@ _EOF cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" fi cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" - - if [ -n "$XBPS_DEBUG_PKGS" ] && [ -z $nodebug ]; then - cmake_args+=" -DCMAKE_BUILD_TYPE=RelWithDebInfo" - else - cmake_args+=" -DCMAKE_BUILD_TYPE=Release" - fi + cmake_args+=" -DCMAKE_BUILD_TYPE=Release" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib32"