From 44c787d48250de34712c2ca160f645e762c143e3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Mar 2021 13:38:49 +0100 Subject: [PATCH] try workaround cmake in a better way as it wasn't working all the time make -j 7 -C build-llvm/tools/clang/stage2-bins docs-llvm-html docs-clang-html docs-clang-tools-html docs-clang-tools-man docs-clang-man docs-llvm-man make[2]: Entering directory '/build/llvm-toolchain-9-9~+20210327121910+c1a0a213378a/build-llvm/tools/clang/stage2-bins' /tmp/cmake/bin/cmake -S"/build/llvm-toolchain-9-9~+20210327121910+c1a0a213378a/llvm" -B"/build/llvm-toolchain-9-9~+20210327121910+c1a0a213378a/build-llvm/tools/clang/stage2-bins" --check-build-system CMakeFiles/Makefile.cmake 0 /tmp/cmake/bin/cmake: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory Makefile:39750: recipe for target 'cmake_check_build_system' failed --- debian/rules | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/debian/rules b/debian/rules index 5140dc03..34ebf662 100755 --- a/debian/rules +++ b/debian/rules @@ -281,6 +281,14 @@ ifneq (,$(filter $(DEB_HOST_ARCH), mips64 mips64el)) LIBOMP_ARCH = mips64 endif +# if cmake is installed in /tmp/cmake/ uses it +# Used to build llvm on old ubuntu (precise) on the llvm.org/apt/ ci +CMAKE_BIN=cmake; \ + +ifeq (,$(wildcard /tmp/cmake/bin/cmake)) + CMAKE_BIN=/tmp/cmake/bin/cmake + export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/ +endif %: dh $@ $(DH_OPTIONS) @@ -350,13 +358,7 @@ override_dh_auto_configure: preconfigure fi) echo "Running tests: $(RUN_TEST)" - - # if cmake is installed in /tmp/cmake/ uses it - # Used to build llvm on old ubuntu (precise) on the llvm.org/apt/ ci - CMAKE_BIN=cmake; \ if test -f /tmp/cmake/bin/cmake; then \ - CMAKE_BIN=/tmp/cmake/bin/cmake; \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \ fi; \ echo "Using cmake: $$CMAKE_BIN"; \ cd $(TARGET_BUILD) && \ @@ -395,9 +397,6 @@ VERBOSE=VERBOSE=1 #VERBOSE=-v debian-full-build: - if test -f /tmp/cmake/bin/cmake; then \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \ - fi; \ $(PRE_PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CFLAGS="$(CFLAGS_EXTRA)" CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 $(BUILD_METHOD) # Check the stage 2 build worked @@ -444,11 +443,6 @@ debian-libcxx-build: mkdir -p libcxx/build mkdir -p libcxxabi/build - CMAKE_BIN=cmake; \ - if test -f /tmp/cmake/bin/cmake; then \ - CMAKE_BIN=/tmp/cmake/bin/cmake; \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \ - fi; \ echo "Using cmake: $$CMAKE_BIN"; \ cd libcxxabi/build && \ $(PRE_PROCESS_CONF) $$CMAKE_BIN ../ \ @@ -466,11 +460,6 @@ debian-libcxxabi-build: mkdir -p libcxxabi/build - CMAKE_BIN=cmake; \ - if test -f /tmp/cmake/bin/cmake; then \ - CMAKE_BIN=/tmp/cmake/bin/cmake; \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \ - fi; \ echo "Using cmake: $$CMAKE_BIN"; \ cd libcxx/build && \ $(PRE_PROCESS_CONF) $$CMAKE_BIN ../ \