CMake: use CLING_BINARY_DIR instead of LLVM_BINARY_DIR to configure ClingConfig.cmake#12153
Conversation
|
Can one of the admins verify this patch? |
|
@phsft-bot build |
|
Starting build on |
vgvassilev
left a comment
There was a problem hiding this comment.
This PR is marked as a draft but the change looks good to me in general.
|
|
|
When trying to build with Full build logbuilding '/nix/store/8xsj5zq00fkbndl1zzjngmxj3hhi51hd-root-6.28.00.drv'...
unpacking sources
unpacking source archive /nix/store/y5m4pr7c6vgjr34zqdz7wv819ln1mkj0-source
source root is source
patching sources
applying patch /nix/store/qljayx9yxgyx2xnf81b3rzzi99azd5d6-sw_vers.patch
patching file cmake/modules/SetUpMacOS.cmake
Hunk #1 succeeded at 8 with fuzz 1 (offset -20 lines).
Hunk #2 succeeded at 30 (offset -20 lines).
Hunk #3 succeeded at 74 (offset -34 lines).
patching file config/root-config.in
Hunk #1 succeeded at 313 (offset 1 line).
Hunk #2 succeeded at 373 (offset 1 line).
configuring
patching script interpreter paths in build/unix/
build/unix/makedistsrc.sh: interpreter directive changed from "#! /bin/sh" to "/nix/store/qqa28hmysc23yy081d178jfd9a1yk8aw-bash-5.2-p15/bin/sh"
build/unix/coreteam.sh: interpreter directive changed from "#!/bin/sh" to "/nix/store/qqa28hmysc23yy081d178jfd9a1yk8aw-bash-5.2-p15/bin/sh"
build/unix/compiledata.sh: interpreter directive changed from "#!/usr/bin/env bash" to "/nix/store/qqa28hmysc23yy081d178jfd9a1yk8aw-bash-5.2-p15/bin/bash"
build/unix/makepchinput.py: interpreter directive changed from "#! /usr/bin/env python" to "/nix/store/sp5x6s8n36gjlwck74xhj1i61p66vcpa-python3-3.10.9/bin/python"
build/unix/rootmapcat.py: interpreter directive changed from "#! /usr/bin/env python" to "/nix/store/sp5x6s8n36gjlwck74xhj1i61p66vcpa-python3-3.10.9/bin/python"
build/unix/makereleasenotes.sh: interpreter directive changed from "#! /bin/sh" to "/nix/store/qqa28hmysc23yy081d178jfd9a1yk8aw-bash-5.2-p15/bin/sh"
build/unix/pandoc-jira.sh: interpreter directive changed from "#!/bin/bash" to "/nix/store/qqa28hmysc23yy081d178jfd9a1yk8aw-bash-5.2-p15/bin/bash"
fixing cmake files...
cmake flags: -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_INSTALL_LOCALEDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/share/locale -DCMAKE_INSTALL_LIBEXECDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/libexec -DCMAKE_INSTALL_LIBDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/lib -DCMAKE_INSTALL_DOCDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/share/doc/ROOT -DCMAKE_INSTALL_INFODIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/share/info -DCMAKE_INSTALL_MANDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/share/man -DCMAKE_INSTALL_OLDINCLUDEDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/include -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/include -DCMAKE_INSTALL_SBINDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/sbin -DCMAKE_INSTALL_BINDIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/bin -DCMAKE_INSTALL_NAME_DIR=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_SYSROOT= -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_STRIP=/nix/store/1y8i61anhs9hh1g5x3zw2fvdbivwixzg-gcc-wrapper-11.3.0/bin/strip -DCMAKE_RANLIB=/nix/store/1y8i61anhs9hh1g5x3zw2fvdbivwixzg-gcc-wrapper-11.3.0/bin/ranlib -DCMAKE_AR=/nix/store/1y8i61anhs9hh1g5x3zw2fvdbivwixzg-gcc-wrapper-11.3.0/bin/ar -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=/nix/store/4csvzgc3216rdp2lndklpcqr67w5mcc5-root-6.28.00 -Drpath=ON -Dbuiltin_llvm=OFF -Dbuiltin_freetype=OFF -Dbuiltin_gtest=OFF -Dbuiltin_nlohmannjson=OFF -Dbuiltin_openui5=OFF -Dalien=OFF -Dbonjour=OFF -Dcastor=OFF -Dchirp=OFF -Dclad=OFF -Ddavix=ON -Ddcache=OFF -Dfail-on-missing=ON -Dfftw3=OFF -Dfitsio=OFF -Dfortran=OFF -Dgnuinstall=ON -Dimt=ON -Dgfal=OFF -Dgviz=OFF -Dhdfs=OFF -Dhttp=ON -Dkrb5=OFF -Dldap=OFF -Dmonalisa=OFF -Dmysql=OFF -Dodbc=OFF -Dopengl=ON -Doracle=OFF -Dpgsql=OFF -Dpythia6=OFF -Dpythia8=OFF -Drfio=OFF -Droot7=OFF -Dsqlite=OFF -Dssl=ON -Dtmva=ON -Dvdt=OFF -Dwebgui=OFF -Dxml=ON -Dxrootd=ON -DC_INCLUDE_DIRS=/nix/store/nasgvbblxi25r6y1s82il4m0m4ghib68-glibc-2.35-224-dev/include
-- The C compiler identification is GNU 11.3.0
-- The CXX compiler identification is GNU 11.3.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /nix/store/1y8i61anhs9hh1g5x3zw2fvdbivwixzg-gcc-wrapper-11.3.0/bin/gcc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /nix/store/1y8i61anhs9hh1g5x3zw2fvdbivwixzg-gcc-wrapper-11.3.0/bin/g++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Found Git: /nix/store/bslw1kzx445wxp08ykq2vdsgnr516vcq-git-2.39.1/bin/git (found version "2.39.1")
-- Checking internet connectivity
-- Checking internet connectivity - failed: will not automatically download external dependencies
-- Looking for Python
-- Found Python3: /nix/store/sp5x6s8n36gjlwck74xhj1i61p66vcpa-python3-3.10.9/bin/python3.10 (found version "3.10.9") found components: Interpreter Development NumPy Development.Module Development.Embed
-- Could NOT find Python2 (missing: Python2_EXECUTABLE Python2_INCLUDE_DIRS Python2_LIBRARIES Python2_NumPy_INCLUDE_DIRS Interpreter Development NumPy Development.Module Development.Embed)
Reason given by package:
Interpreter: Wrong major version for the interpreter "/nix/store/sp5x6s8n36gjlwck74xhj1i61p66vcpa-python3-3.10.9/bin/python"
|
This seems unrelated to this PR. |
…ir." This reverts commit 2b283cc. It might not be needed, see root-project#12153 (comment)
|
Thanks, @stephanlachnit ! IIUC what @hahnjo suggests then we'd close this PR in favor of a PR that reverts 2b283cc ? We can see how the revert is doing #12333 and then decide what to do with this PR. |
|
I'm relatively sure it can be made work if we also pass |
Any news on this? Just tested this again with your llvm16 branch and it's still required. |
…lingConfig.cmake This fixes root-project#12151. Signed-off-by: Stephan Lachnit <stephanlachnit@debian.org>
28d91b3 to
211f879
Compare
|
Starting build on |
|
Build failed on ROOT-ubuntu2004/python3. Failing tests: |
|
Build failed on mac11/noimt. Failing tests: |
hahnjo
left a comment
There was a problem hiding this comment.
My approach outlined in #12153 (comment) didn't work, so I'm ok with landing this for now and tackle the Clang patch at a later point. I'll wait for @vgvassilev's final approval before merging though.
And sorry - yes, this fell through the cracks 😐 |
|
Build failed on ROOT-debian10-i386/soversion. Failing tests: |
This Pull request:
Changes or fixes:
Potential fix for #12151. Needs input from @vgvassilev for why
cling_cmake_builddirwas changed in 2b283cc.I did not test this for the non-builtin case and I can't confirm this works fully since testing it is blocked by #12152.
Checklist:
This PR fixes #11920.