From 29a1cf381722bad700d19a597ca60f20aec44b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 14 Mar 2021 20:18:03 +0700 Subject: [PATCH 1/2] build-style/cmake: set CMAKE_BUILD_TYPE to None --- common/build-style/cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 5100a96dfd7b..9d1a1a7a1941 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -52,7 +52,7 @@ _EOF cmake_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" fi cmake_args+=" -DCMAKE_INSTALL_PREFIX=/usr" - cmake_args+=" -DCMAKE_BUILD_TYPE=Release" + cmake_args+=" -DCMAKE_BUILD_TYPE=None" cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib${XBPS_TARGET_WORDSIZE}" if [[ $build_helper = *"qemu"* ]]; then From 45ff98bf8c3eed44872d2ed318a7ab2e289b1aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 15 Mar 2021 08:07:16 +0700 Subject: [PATCH 2/2] amdvlk: allow CMAKE_BUILD_TYPE=None --- .../patches/cmake-build-type-none.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 srcpkgs/amdvlk/patches/cmake-build-type-none.patch diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch new file mode 100644 index 000000000000..7a629e58548e --- /dev/null +++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch @@ -0,0 +1,60 @@ +Index: llvm-project/llvm/CMakeLists.txt +=================================================================== +--- llvm-project/llvm/CMakeLists.txt.orig ++++ llvm-project/llvm/CMakeLists.txt +@@ -251,11 +251,6 @@ endif() + + string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) + +-if (CMAKE_BUILD_TYPE AND +- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +-endif() +- + set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) + + set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") +Index: pal/cmake/Modules/AmdCmakeHelper.cmake +=================================================================== +--- pal/cmake/Modules/AmdCmakeHelper.cmake.orig ++++ pal/cmake/Modules/AmdCmakeHelper.cmake +@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES) + else() + string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE) + +- if (CMAKE_BUILD_TYPE AND +- NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +- endif() +- + if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set(CMAKE_BUILD_TYPE_DEBUG ON) + set(CMAKE_BUILD_TYPE_RELEASE OFF) +Index: xgl/CMakeLists.txt +=================================================================== +--- xgl/CMakeLists.txt.orig ++++ xgl/CMakeLists.txt +@@ -181,11 +181,6 @@ if (CMAKE_CONFIGURATION_TYPES) + else() + string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE) + +- if (CMAKE_BUILD_TYPE AND +- NOT capital_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") +- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +- endif() +- + if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set(CMAKE_BUILD_TYPE_DEBUG ON) + set(CMAKE_BUILD_TYPE_RELEASE OFF) +Index: xgl/icd/CMakeLists.txt +=================================================================== +--- xgl/icd/CMakeLists.txt.orig ++++ xgl/icd/CMakeLists.txt +@@ -84,7 +84,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Cl + endif() + + if(CMAKE_BUILD_TYPE_RELEASE) +- target_compile_options(xgl PRIVATE -O3) + if(XGL_ENABLE_LTO) + if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") + execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)