Skip to content

Cleanup ROOT recipe #6116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
singiamtel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cleanup ROOT recipe #6116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions root.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ prepend_path:
PYTHONPATH: "$ROOTSYS/lib"
ROOT_DYN_PATH: "$ROOT_ROOT/lib"
incremental_recipe: |
#!/bin/bash -e
# Limit parallel builds to prevent OOM
cmake --build . --target install ${JOBS+-j $JOBS}
rm -vf "$INSTALLROOT/etc/plugins/TGrid/P010_TAlien.C" \
Expand All @@ -59,11 +60,8 @@ cat >/dev/null <<EOF
EOF

unset ROOTSYS
COMPILER_CC=cc
COMPILER_CXX=c++
COMPILER_LD=c++
[[ "$CXXFLAGS" == *'-std=c++11'* ]] && CMAKE_CXX_STANDARD=11 || true
case $CXXFLAGS in
*-std=c++11*) CMAKE_CXX_STANDARD=11 ;;
*-std=c++14*) CMAKE_CXX_STANDARD=14 ;;
*-std=c++17*) CMAKE_CXX_STANDARD=17 ;;
*-std=c++20*) CMAKE_CXX_STANDARD=20 ;;
Expand All @@ -82,9 +80,6 @@ case $ARCHITECTURE in
ENABLE_COCOA=1
DISABLE_MYSQL=1
USE_BUILTIN_GLEW=1
COMPILER_CC=clang
COMPILER_CXX=clang++
COMPILER_LD=clang
SONAME=dylib
[[ ! $GSL_ROOT ]] && GSL_ROOT=$(brew --prefix gsl)
[[ ! $OPENSSL_ROOT ]] && SYS_OPENSSL_ROOT=$(brew --prefix openssl@3)
Expand Down Expand Up @@ -156,10 +151,7 @@ cmake $SOURCEDIR
${ENABLE_COCOA:+-Dcocoa=ON} \
-DCMAKE_IGNORE_PATH=/opt/homebrew/include \
${EXTRA_CMAKE_OPTIONS} \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_C_COMPILER=$COMPILER_CC \
-Dfortran=OFF \
-DCMAKE_LINKER=$COMPILER_LD \
${GCC_TOOLCHAIN_REVISION:+-DCMAKE_EXE_LINKER_FLAGS="-L$GCC_TOOLCHAIN_ROOT/lib64"} \
${OPENSSL_ROOT:+-DOPENSSL_ROOT=$OPENSSL_ROOT} \
${OPENSSL_ROOT:+-DOPENSSL_INCLUDE_DIR=$OPENSSL_ROOT/include} \
Expand Down
Loading