From: Jan Kratochvil Date: Wed, 5 Aug 2020 21:13:42 +0000 (+0200) Subject: (no commit message) X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=commitdiff_plain;h=b3a357f46eb1733de91e6980709bb4cfff20d8db --- diff --git a/cmake-old1.patch b/cmake-old1.patch deleted file mode 100644 index 5435bbb..0000000 --- a/cmake-old1.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 1d3f61f8a799489f7f4d81e46d9e6b31a954ea4e -Author: Louis Dionne -Date: Wed Apr 22 11:16:27 2020 -0400 - - [CMake] Enforce the minimum CMake version to be at least 3.13.4 - - This commit changes the warning for CMake < 3.13.4 into a fatal error. - The intent is to revert and re-apply this simple commit until all build - bots are migrated to CMake >= 3.13.4. - - This is part of the effort discussed on llvm-dev here: - - http://lists.llvm.org/pipermail/llvm-dev/2020-April/140578.html - - Differential Revision: https://reviews.llvm.org/D78646 - -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index d144266b20f..303b39221d9 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -3,11 +3,9 @@ - cmake_minimum_required(VERSION 3.4.3) - - if ("${CMAKE_VERSION}" VERSION_LESS "3.13.4") -- message(WARNING -- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 12.0.0, the " -- "minimum version of CMake required to build LLVM will become 3.13.4, and " -- "using an older CMake will become an error. Please upgrade your CMake to " -- "at least 3.13.4 now to avoid issues in the future!") -+ message(FATAL_ERROR -+ "Your CMake version is ${CMAKE_VERSION}. The minimum version of CMake " -+ "required to build LLVM is now 3.13.4.") - endif() - - if(POLICY CMP0068) diff --git a/cmake-old2.patch b/cmake-old2.patch deleted file mode 100755 index 86aec15..0000000 --- a/cmake-old2.patch +++ /dev/null @@ -1,432 +0,0 @@ -commit afa1afd4108d973e059e5f5ad68cf01efe7985da -Author: Louis Dionne -Date: Wed Apr 22 11:15:05 2020 -0400 - - [CMake] Bump CMake minimum version to 3.13.4 - - This upgrade should be friction-less because we've already been ensuring - that CMake >= 3.13.4 is used. - - This is part of the effort discussed on llvm-dev here: - - http://lists.llvm.org/pipermail/llvm-dev/2020-April/140578.html - - Differential Revision: https://reviews.llvm.org/D78648 - -diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt -index 948452661a3..1a6a20a271f 100644 ---- a/clang/CMakeLists.txt -+++ b/clang/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0075) - cmake_policy(SET CMP0075 NEW) -diff --git a/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt b/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt -index 42ee1d11db8..007ad4530d6 100644 ---- a/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt -+++ b/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt -@@ -1,6 +1,6 @@ - project(exec C) - --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - include(CheckCCompilerFlag) - check_c_compiler_flag("-std=c99" C99_SUPPORTED) -diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt -index fa62814b635..cfbd07a40e1 100644 ---- a/compiler-rt/CMakeLists.txt -+++ b/compiler-rt/CMakeLists.txt -@@ -3,7 +3,7 @@ - # An important constraint of the build is that it only produces libraries - # based on the ability of the host toolchain to target various platforms. - --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0075) - cmake_policy(SET CMP0075 NEW) -diff --git a/compiler-rt/cmake/Modules/CustomLibcxx/CMakeLists.txt b/compiler-rt/cmake/Modules/CustomLibcxx/CMakeLists.txt -index e61c222587e..26d17ce6f14 100644 ---- a/compiler-rt/cmake/Modules/CustomLibcxx/CMakeLists.txt -+++ b/compiler-rt/cmake/Modules/CustomLibcxx/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - project(custom-libcxx C CXX) - - # Build static libcxxabi. -diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt -index 058bfc815a1..99aed905d75 100644 ---- a/compiler-rt/lib/builtins/CMakeLists.txt -+++ b/compiler-rt/lib/builtins/CMakeLists.txt -@@ -3,7 +3,7 @@ - # architecture-specific code in various subdirectories. - - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) -- cmake_minimum_required(VERSION 3.4.3) -+ cmake_minimum_required(VERSION 3.13.4) - - project(CompilerRTBuiltins C ASM) - set(COMPILER_RT_STANDALONE_BUILD TRUE) -diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt -index 13e675f1096..9dd6281d410 100644 ---- a/flang/CMakeLists.txt -+++ b/flang/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.9.0) -+cmake_minimum_required(VERSION 3.13.4) - - # RPATH settings on macOS do not affect INSTALL_NAME. - if (POLICY CMP0068) -diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt -index 9472f191fbd..c12dc10fa45 100644 ---- a/libclc/CMakeLists.txt -+++ b/libclc/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required( VERSION 3.9.2 ) -+cmake_minimum_required(VERSION 3.13.4) - - project( libclc VERSION 0.2.0 LANGUAGES CXX ) - include( GNUInstallDirs ) -diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt -index caf655d6799..a5adccf62a9 100644 ---- a/libcxx/CMakeLists.txt -+++ b/libcxx/CMakeLists.txt -@@ -8,7 +8,7 @@ endif() - #=============================================================================== - # Setup Project - #=============================================================================== --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0042) - cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default -diff --git a/libcxx/utils/ci/runtimes/CMakeLists.txt b/libcxx/utils/ci/runtimes/CMakeLists.txt -index 43ebf9e4a19..f46ef63b809 100644 ---- a/libcxx/utils/ci/runtimes/CMakeLists.txt -+++ b/libcxx/utils/ci/runtimes/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0068) - cmake_policy(SET CMP0068 NEW) -diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt -index e4e20d950b8..534ef7e8c84 100644 ---- a/libcxxabi/CMakeLists.txt -+++ b/libcxxabi/CMakeLists.txt -@@ -8,7 +8,7 @@ endif() - # Setup Project - #=============================================================================== - --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0042) - cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default -diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt -index b50550dc376..c5b536532f3 100644 ---- a/libunwind/CMakeLists.txt -+++ b/libunwind/CMakeLists.txt -@@ -2,7 +2,7 @@ - # Setup Project - #=============================================================================== - --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - if (POLICY CMP0042) - cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default -diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt -index 5090c935e75..e9bd1bd29c5 100644 ---- a/lld/CMakeLists.txt -+++ b/lld/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Check if lld is built as a standalone project. - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(lld) -- cmake_minimum_required(VERSION 3.4.3) -+ cmake_minimum_required(VERSION 3.13.4) - - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) -diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt -index b1c0597cf3b..14cfba1f64f 100644 ---- a/lldb/CMakeLists.txt -+++ b/lldb/CMakeLists.txt -@@ -1,7 +1,4 @@ --cmake_minimum_required(VERSION 3.4.3) --if(CMAKE_SYSTEM_NAME STREQUAL Windows) -- cmake_minimum_required(VERSION 3.13) --endif() -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0075) - cmake_policy(SET CMP0075 NEW) -diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt -index fc23cf3c7e2..eba5c414913 100644 ---- a/lldb/tools/debugserver/CMakeLists.txt -+++ b/lldb/tools/debugserver/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - project(Debugserver LANGUAGES C CXX ASM-ATT) - -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index a3353a40238..ddf80715632 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -1,12 +1,6 @@ - # See docs/CMake.html for instructions about how to build LLVM with CMake. - --cmake_minimum_required(VERSION 3.4.3) -- --if ("${CMAKE_VERSION}" VERSION_LESS "3.13.4") -- message(FATAL_ERROR -- "Your CMake version is ${CMAKE_VERSION}. The minimum version of CMake " -- "required to build LLVM is now 3.13.4.") --endif() -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0068) - cmake_policy(SET CMP0068 NEW) -diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst -index 1f908d3e95b..f96e34f21e8 100644 ---- a/llvm/docs/CMake.rst -+++ b/llvm/docs/CMake.rst -@@ -34,7 +34,7 @@ Quick start - We use here the command-line, non-interactive CMake interface. - - #. `Download `_ and install -- CMake. Version 3.4.3 is the minimum required. -+ CMake. Version 3.13.4 is the minimum required. - - #. Open a shell. Your development tools must be reachable from this shell - through the PATH environment variable. -@@ -717,7 +717,7 @@ and uses them to build a simple application ``simple-tool``. - - .. code-block:: cmake - -- cmake_minimum_required(VERSION 3.4.3) -+ cmake_minimum_required(VERSION 3.13.4) - project(SimpleProject) - - find_package(LLVM REQUIRED CONFIG) -diff --git a/llvm/docs/CMakePrimer.rst b/llvm/docs/CMakePrimer.rst -index abfd08017fb..bc63ac1c027 100644 ---- a/llvm/docs/CMakePrimer.rst -+++ b/llvm/docs/CMakePrimer.rst -@@ -54,7 +54,7 @@ program. The example uses only CMake language-defined functions. - - .. code-block:: cmake - -- cmake_minimum_required(VERSION 3.2) -+ cmake_minimum_required(VERSION 3.15) - project(HelloWorld) - add_executable(HelloWorld HelloWorld.cpp) - -@@ -64,13 +64,13 @@ block to define "APPLE" when targeting Apple platforms: - - .. code-block:: cmake - -- cmake_minimum_required(VERSION 3.2) -+ cmake_minimum_required(VERSION 3.15) - project(HelloWorld) - add_executable(HelloWorld HelloWorld.cpp) - if(APPLE) - target_compile_definitions(HelloWorld PUBLIC APPLE) - endif() -- -+ - Variables, Types, and Scope - =========================== - -@@ -93,7 +93,7 @@ example: - set(var_name var1) - set(${var_name} foo) # same as "set(var1 foo)" - set(${${var_name}}_var bar) # same as "set(foo_var bar)" -- -+ - Dereferencing an unset variable results in an empty expansion. It is a common - pattern in CMake to conditionally set variables knowing that it will be used in - code paths that the variable isn't set. There are examples of this throughout -@@ -107,7 +107,7 @@ An example of variable empty expansion is: - set(extra_sources Apple.cpp) - endif() - add_executable(HelloWorld HelloWorld.cpp ${extra_sources}) -- -+ - In this example the ``extra_sources`` variable is only defined if you're - targeting an Apple platform. For all other targets the ``extra_sources`` will be - evaluated as empty before add_executable is given its arguments. -@@ -124,7 +124,7 @@ defining lists: - # Creates a list with members a, b, c, and d - set(my_list a b c d) - set(my_list "a;b;c;d") -- -+ - # Creates a string "a b c d" - set(my_string "a b c d") - -@@ -141,7 +141,7 @@ make a list of variable names that refer to other lists. For example: - set(a 1 2 3) - set(b 4 5 6) - set(c 7 8 9) -- -+ - With this layout you can iterate through the list of lists printing each value - with the following code: - -@@ -152,7 +152,7 @@ with the following code: - message(${value}) - endforeach() - endforeach() -- -+ - You'll notice that the inner foreach loop's list is doubly dereferenced. This is - because the first dereference turns ``list_name`` into the name of the sub-list - (a, b, or c in the example), then the second dereference is to get the value of -@@ -385,7 +385,7 @@ result in some unexpected behavior if using unreferenced variables. For example: - message("${var}") - endforeach() - endmacro() -- -+ - set(my_list a b c d) - set(my_list_of_numbers 1 2 3 4) - print_list(my_list_of_numbers) -diff --git a/llvm/docs/GettingStarted.rst b/llvm/docs/GettingStarted.rst -index 478571bd4c2..c30ebecc89e 100644 ---- a/llvm/docs/GettingStarted.rst -+++ b/llvm/docs/GettingStarted.rst -@@ -167,7 +167,7 @@ uses the package and provides other details. - =========================================================== ============ ========================================== - Package Version Notes - =========================================================== ============ ========================================== --`CMake `__ >=3.4.3 Makefile/workspace generator -+`CMake `__ >=3.13.4 Makefile/workspace generator - `GCC `_ >=5.1.0 C/C++ compiler\ :sup:`1` - `python `_ >=2.7 Automated test suite\ :sup:`2` - `zlib `_ >=1.2.3.4 Compression library\ :sup:`3` -diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt -index 0f29e24a26e..dc74a46c70b 100644 ---- a/llvm/runtimes/CMakeLists.txt -+++ b/llvm/runtimes/CMakeLists.txt -@@ -7,7 +7,7 @@ - # Setting CMake minimum required version should be at the very top of the file - # if this is the entry point. - if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) -- cmake_minimum_required(VERSION 3.4.3) -+ cmake_minimum_required(VERSION 3.13.4) - project(Runtimes C CXX ASM) - endif() - -@@ -56,7 +56,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - set_property(GLOBAL APPEND PROPERTY SUB_COMPONENTS ${name}) - endfunction() - -- cmake_minimum_required(VERSION 3.4.3) -+ cmake_minimum_required(VERSION 3.13.4) - project(Runtimes C CXX ASM) - - find_package(LLVM PATHS "${LLVM_BINARY_DIR}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) -diff --git a/llvm/utils/benchmark/CMakeLists.txt b/llvm/utils/benchmark/CMakeLists.txt -index 38bc8c6bc95..542c70ca494 100644 ---- a/llvm/utils/benchmark/CMakeLists.txt -+++ b/llvm/utils/benchmark/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 2.8.12) -+cmake_minimum_required(VERSION 3.13.4) - - # Tell cmake 3.0+ that it's safe to clear the PROJECT_VERSION variable in the - # call to project() below. -diff --git a/mlir/examples/standalone/CMakeLists.txt b/mlir/examples/standalone/CMakeLists.txt -index 9f30f70f949..45dc80804aa 100644 ---- a/mlir/examples/standalone/CMakeLists.txt -+++ b/mlir/examples/standalone/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.10) -+cmake_minimum_required(VERSION 3.13.4) - - if(POLICY CMP0068) - cmake_policy(SET CMP0068 NEW) -diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt -index 6f0d9e72800..f18688f08c4 100644 ---- a/openmp/CMakeLists.txt -+++ b/openmp/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.13.4) - - # Add cmake directory to search for custom cmake functions. - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) -diff --git a/openmp/cmake/DetectTestCompiler/CMakeLists.txt b/openmp/cmake/DetectTestCompiler/CMakeLists.txt -index c230fc8d4cf..7fa32a90972 100644 ---- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt -+++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.13.4) - project(DetectTestCompiler C CXX) - - include(CheckCCompilerFlag) -diff --git a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake b/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake -index 2b6cda676a6..e601e53f112 100644 ---- a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake -+++ b/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake -@@ -17,7 +17,7 @@ function(libomp_check_linker_flag flag boolean) - set(library_source - "int foo(int a) { return a*a; }") - set(cmake_source -- "cmake_minimum_required(VERSION 2.8) -+ "cmake_minimum_required(VERSION 3.13.4) - project(foo C) - set(CMAKE_SHARED_LINKER_FLAGS \"${flag}\") - add_library(foo SHARED src_to_link.c)") -diff --git a/parallel-libs/CMakeLists.txt b/parallel-libs/CMakeLists.txt -index c1fcf45cd71..35ca8bc1bce 100644 ---- a/parallel-libs/CMakeLists.txt -+++ b/parallel-libs/CMakeLists.txt -@@ -1 +1 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.13.4) -diff --git a/parallel-libs/acxxel/CMakeLists.txt b/parallel-libs/acxxel/CMakeLists.txt -index 547dd62d2fb..7e71446107a 100644 ---- a/parallel-libs/acxxel/CMakeLists.txt -+++ b/parallel-libs/acxxel/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.13.4) - - option(ACXXEL_ENABLE_UNIT_TESTS "enable acxxel unit tests" ON) - option(ACXXEL_ENABLE_MULTI_DEVICE_UNIT_TESTS "enable acxxel multi-device unit tests" OFF) -diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt -index 9939097f743..2e94512b2cf 100644 ---- a/polly/CMakeLists.txt -+++ b/polly/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Check if this is a in tree build. - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) -- cmake_minimum_required(VERSION 3.4.3) -+ cmake_minimum_required(VERSION 3.13.4) - - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) -diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt -index 8e6e1354707..8bea8843589 100644 ---- a/pstl/CMakeLists.txt -+++ b/pstl/CMakeLists.txt -@@ -5,7 +5,7 @@ - # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - # - #===----------------------------------------------------------------------===## --cmake_minimum_required(VERSION 3.4.3) -+cmake_minimum_required(VERSION 3.13.4) - - set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") - file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") diff --git a/lldb-experimental.spec b/lldb-experimental.spec index beb6a99..c48e4dd 100644 --- a/lldb-experimental.spec +++ b/lldb-experimental.spec @@ -13,32 +13,37 @@ %global debug_package %{nil} %endif Name: lldb-experimental -Version: 11.0.0 -Release: 0.20200805snap0%{?dist} +Version: 12.0.0 +Release: 0.20200805snap1%{?dist} Summary: Next generation high-performance debugger - experimental trunk snapshot License: NCSA URL: http://lldb.llvm.org/ -Patch1: cmake-old1.patch -Patch2: cmake-old2.patch ExclusiveArch: x86_64 BuildRequires: gcc-c++ git libedit-devel libatomic libxml2-devel zlib-devel valgrind-devel libpfm-devel # https://src.fedoraproject.org/rpms/epydoc #BuildRequires: epydoc %if 0%{?rhel:1} && 0%{?rhel} <= 7 -BuildRequires: llvm-toolset-7-cmake devtoolset-8-gcc-c++ python-devel python2-pyyaml +BuildRequires: devtoolset-8-gcc-c++ # swig on rhel7: /builddir/build/BUILD/lldb-experimental-11.0.0/lldb/bindings/./python/python-typemaps.swig:496: Error: Syntax error in input(3). BuildRequires: swig3 BuildRequires: rh-git218-git-core +BuildRequires: rh-python38-python-devel rh-python38-python-pyyaml # https://bugzilla.redhat.com/show_bug.cgi?id=1511892 -%global __cmake /opt/rh/llvm-toolset-7/root/usr/bin/cmake3 +BuildRequires: cmake3 +%global cmake %{cmake3} +%global cmake_build %{cmake3_build} +%global cmake_install %{cmake3_install} %else -%if !0%{?rhel:1} || 0%{?rhel} > 8 -BuildRequires: z3-devel -%endif +# FIXME: CentOS-8: +# CMake Error at CMakeLists.txt:3 (cmake_minimum_required): +# CMake 3.13.4 or higher is required. You are running version 3.11.4 BuildRequires: cmake swig BuildRequires: python3-devel python3-pygments python3-pyyaml # removed in F31+ #BuildRequires: xar-devel +%if !0%{?rhel:1} || 0%{?rhel} > 8 +BuildRequires: z3-devel +%endif %endif %description @@ -72,6 +77,24 @@ The package contains header files for %{name}. # git clone --depth 10000 --single-branch --reference ../reference https://github.com/llvm/llvm-project.git . # fatal: git fetch-pack: expected shallow list . /opt/rh/rh-git218/enable +# CMake Warning at ../lldb/cmake/modules/FindPythonInterpAndLibs.cmake:10 (find_package): +# By not providing "FindPython3.cmake" in CMAKE_MODULE_PATH this project has +# asked CMake to find a package configuration file provided by "Python3", but +# CMake did not find one. +# Could not find a package configuration file provided by "Python3" with any +# of the following names: +# Python3Config.cmake +# python3-config.cmake +# Add the installation prefix of "Python3" to CMAKE_PREFIX_PATH or set +# "Python3_DIR" to a directory containing one of the above files. If +# "Python3" provides a separate development package or SDK, be sure it has +# been installed. +# Call Stack (most recent call first): +# ../lldb/cmake/modules/FindPythonInterpAndLibs.cmake:71 (FindPython3) +# ../lldb/cmake/modules/LLDBConfig.cmake:48 (find_package) +# ../lldb/cmake/modules/LLDBConfig.cmake:59 (add_optional_dependency) +# ../lldb/CMakeLists.txt:28 (include) +. /opt/rh/rh-python38/enable %endif %setup -q -c -T OPTS="--depth 10000" @@ -100,8 +123,6 @@ git merge jankratochvil/dwz # '-c merge.renameLimit=0' has no effect. git -c merge.renameLimit=1 merge jankratochvil/rust %endif -%patch2 -p1 -R -%patch1 -p1 -R %build FLAGS="%{optflags}" @@ -154,11 +175,7 @@ CXXFLAGS="$FLAGS" -DLLDB_DISABLE_LIBEDIT=OFF \ -DLLDB_DISABLE_PYTHON=OFF \ # -%if 0%{?rhel:1} && 0%{?rhel} <= 8 -%__cmake --build . -- %{?_smp_mflags} -%else %cmake_build -%endif %install mkdir -p %{buildroot}%{pkg_prefix} @@ -173,12 +190,7 @@ mkdir -p %{buildroot}%{pkg_prefix} revline . jankratochvil/rust %endif ) >%{buildroot}%{pkg_prefix}/HEAD -%if 0%{?rhel:1} && 0%{?rhel} <= 8 -# It runs a new configure without installing anything: DESTDIR="%{buildroot}" #__cmake --install . -%make_install -%else %cmake_install -%endif mkdir -p %{buildroot}%{_bindir} # lldb-mi for i in lldb;do