From ad7e58e733f4e81528ca807fd46146f80a99fa9c Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:20:10 +0200 Subject: [PATCH 01/18] Bump to ROOT v6-32-06-alice1 (#5625) * Get externals to work on macOS Sequoia - Make sure ROOT works on macOS 15 Sequoia (requires enabling ROOT7) - Disable VecGeom on macOS (apparently not used) * Bump to v6-32-06-alice1 - Get Pythia6 back - Get Proof back --- o2.sh | 2 +- root.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/o2.sh b/o2.sh index 3238f04943..88963be782 100644 --- a/o2.sh +++ b/o2.sh @@ -23,7 +23,7 @@ requires: - libuv - libjalienO2 - cgal - - VecGeom + - "VecGeom:(?!osx.*)" - FFTW3 - ONNXRuntime - MLModels diff --git a/root.sh b/root.sh index d8f5a0ba48..a290bb4a54 100644 --- a/root.sh +++ b/root.sh @@ -1,6 +1,6 @@ package: ROOT version: "%(tag_basename)s" -tag: "v6-32-02-alice1" +tag: "v6-32-06-alice1" source: https://github.com/alisw/root.git requires: - arrow @@ -125,6 +125,7 @@ fi case $PKG_VERSION in v6[-.]30*) EXTRA_CMAKE_OPTIONS="-Dminuit2=ON -Dpythia6=ON -Dpythia6_nolink=ON" ;; + v6[-.]32[-.]0[6789]*) EXTRA_CMAKE_OPTIONS="-Dminuit=ON -Dpythia6=ON -Dpythia6_nolink=ON -Dproof=ON" ;; *) EXTRA_CMAKE_OPTIONS="-Dminuit=ON" ;; esac @@ -169,7 +170,7 @@ cmake $SOURCEDIR -Dmathmore=ON \ -Droofit=ON \ -Dhttp=ON \ - -Droot7=OFF \ + -Droot7=ON \ -Dsoversion=ON \ -Dshadowpw=OFF \ -Dvdt=OFF \ From 6db065b0e5ac9850a3f3883a0b83614f2ef77718 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 24 Sep 2024 15:21:34 +0200 Subject: [PATCH 02/18] AEGIS: go back to official version (#5638) --- aegis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aegis.sh b/aegis.sh index 0fd7253fcb..a0eb24d6c5 100644 --- a/aegis.sh +++ b/aegis.sh @@ -1,6 +1,6 @@ package: AEGIS version: "%(tag_basename)s" -tag: v1.5.3-alice2 +tag: v1.5.3 requires: - ROOT - VMC From c812e5c1dc9adc75358b7aed2985dd217ebd7920 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 24 Sep 2024 23:13:41 +0200 Subject: [PATCH 03/18] Python: avoid dependency on libcrypt (#5637) Dependency is deprecated and it is causing issues when using python across different platforms. It will in any case be removed in python 3.13. --- python.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python.sh b/python.sh index 521a025158..6650da6440 100644 --- a/python.sh +++ b/python.sh @@ -61,11 +61,16 @@ SSL=$OPENSSL_ROOT _ssl _ssl.c \ -DUSE_SSL -I\$(SSL)/include -I\$(SSL)/include/openssl \ -L\$(SSL)/lib -lssl -lcrypto -EOF +# Get rid of the dependency on libcrypt (which is going away in any case in python 3.13) +_crypt _cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems + +*disabled* +_crypt +EOF fi -./configure --prefix="$INSTALLROOT" \ +LIBCRYPT_CFLAGS=-lunknown ac_cv_search_crypt=no ac_cv_search_crypt_r=no ./configure --prefix="$INSTALLROOT" \ ${OPENSSL_ROOT:+--with-openssl=$OPENSSL_ROOT} ${OPENSSL_ROOT:+--with-openssl-rpath=no} \ --enable-shared \ --with-system-expat \ From 29ca220809da933c5755022f72a8509fa6a0d46c Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Wed, 25 Sep 2024 06:30:54 +0200 Subject: [PATCH 04/18] Auto-update: defaults-o2.sh o2pdpsuite.sh o2physics.sh o2.sh o2dpg.sh --- o2.sh | 2 +- o2dpg.sh | 2 +- o2pdpsuite.sh | 2 +- o2physics.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/o2.sh b/o2.sh index 88963be782..22f7d53ae5 100644 --- a/o2.sh +++ b/o2.sh @@ -1,6 +1,6 @@ package: O2 version: "%(tag_basename)s" -tag: "daily-20240924-0200" +tag: "daily-20240925-0200" requires: - abseil - arrow diff --git a/o2dpg.sh b/o2dpg.sh index 809300edca..cdf04c5412 100644 --- a/o2dpg.sh +++ b/o2dpg.sh @@ -1,6 +1,6 @@ package: O2DPG version: "%(tag_basename)s" -tag: "daily-20240924-0200" +tag: "daily-20240925-0200" source: https://github.com/AliceO2Group/O2DPG.git build_requires: - alibuild-recipe-tools diff --git a/o2pdpsuite.sh b/o2pdpsuite.sh index fcecb928a2..ba76bf1aa7 100644 --- a/o2pdpsuite.sh +++ b/o2pdpsuite.sh @@ -1,6 +1,6 @@ package: O2PDPSuite version: "%(tag_basename)s" -tag: "daily-20240924-0200" +tag: "daily-20240925-0200" requires: # List important packages separately, even though they're also # pulled in by O2sim, so they show up in the dependency list on Monalisa. diff --git a/o2physics.sh b/o2physics.sh index 418cc3a13c..c2aec5d504 100644 --- a/o2physics.sh +++ b/o2physics.sh @@ -1,6 +1,6 @@ package: O2Physics version: "%(tag_basename)s" -tag: "daily-20240924-0200" +tag: "daily-20240925-0200" requires: - O2 - ONNXRuntime From 83cf457d1459af9f9396726ccf17258da39d47c1 Mon Sep 17 00:00:00 2001 From: ehellbar Date: Wed, 25 Sep 2024 08:43:12 +0200 Subject: [PATCH 05/18] defaults-o2-epn: disable AliGenO2 for online processing (#5640) --- defaults-o2-epn.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults-o2-epn.sh b/defaults-o2-epn.sh index 6cf66b677e..738c47c5d5 100644 --- a/defaults-o2-epn.sh +++ b/defaults-o2-epn.sh @@ -10,6 +10,7 @@ env: GEANT4_BUILD_MULTITHREADED: 'OFF' disable: - AliGenerators + - AliGenO2 - O2Physics - KFParticle - OpenSSL From b948b98fc70107bb5b5c241ee8a3ef9dd5be9990 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:27:12 +0200 Subject: [PATCH 06/18] Fix broken rivet modulefile (#5641) --- rivet.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rivet.sh b/rivet.sh index 2c68c966a1..2eff52c934 100644 --- a/rivet.sh +++ b/rivet.sh @@ -204,10 +204,10 @@ prepend-path LD_LIBRARY_PATH \$RIVET_ROOT/lib # Here trying to keep the env variable changes to their minimum, i.e touch only TEXINPUTS, LATEXINPUTS # Manual prepend-path for TEX variables # catch option to fix compatibility issues with multiple systems -if { [catch {exec which kpsewhich > /dev/null 2>&1 && kpsewhich -var-value TEXINPUTS} tempTEX] } { - set Old_TEXINPUTS [ exec sh -c "which kpsewhich > /dev/null 2>&1 && kpsewhich -var-value TEXINPUTS" ] +if { [catch {exec kpsewhich -var-value TEXINPUTS} brokenTEX] } { + set Old_TEXINPUTS \$brokenTEX } else { - set Old_TEXINPUTS \$tempTEX + set Old_TEXINPUTS [ exec sh -c "kpsewhich -var-value TEXINPUTS" ] } set Extra_RivetTEXINPUTS \$RIVET_ROOT/share/Rivet/texmf/tex// From e59fdd43ad2a70c9ab7febdec3b3ba77dab8015c Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:25:03 +0200 Subject: [PATCH 07/18] GCC: avoid naming conflicts (#5634) - do not install GMP used to compile GCC. Other externals depend on their own GMP since we do not want to bind the lifetime of GMP upgrades to the lifetime of GCC ones. This was done to avoid reproducibility issues in e.g. FastJet and CGal. - Remove the sim folder which conflicts with FairRoot. --- gcc-toolchain.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc-toolchain.sh b/gcc-toolchain.sh index 6ee7741deb..05997b4523 100644 --- a/gcc-toolchain.sh +++ b/gcc-toolchain.sh @@ -121,7 +121,6 @@ pushd build-gcc --disable-nls make ${JOBS+-j $JOBS} bootstrap-lean MAKEINFO=":" make install MAKEINFO=":" - (if cd gmp || cd ../gmp; then make install MAKEINFO=":"; fi) hash -r # GCC creates c++, but not cc @@ -268,6 +267,10 @@ pushd build-gdb rm -f "$INSTALLROOT"/lib/*.la popd +# We remove the sim folder because it's not used and actually +# conflicts with FairRoot when installing in a single installation +# path. +rm -fr "$INSTALLROOT"/include/sim # If fixincludes is not desired, see: # http://ewontfix.com/12/ # https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?view=markup&sortby=log#l1524 From 3b17bb1b1a34083a06af78169f7d8cd1bfe3ea32 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <47090312+singiamtel@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:51:19 +0200 Subject: [PATCH 08/18] Use original TPC repository (#5623) This way we can get rid of the mirror --- tpcfecutils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpcfecutils.sh b/tpcfecutils.sh index 830f9af614..a33050f35a 100644 --- a/tpcfecutils.sh +++ b/tpcfecutils.sh @@ -10,7 +10,7 @@ requires: - LLA build_requires: - CMake -source: https://gitlab.cern.ch/ALICEPrivateExternals/alice-tpc-fec-utils.git +source: https://gitlab.cern.ch/alice-tpc-upgrade/alice-tpc-fec-utils incremental_recipe: | make ${JOBS:+-j$JOBS} install mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles From ee1d3066d6c33e0ee0042e4cc2e44cb057a1af5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Wed, 25 Sep 2024 15:53:43 +0200 Subject: [PATCH 09/18] Don't hard-code the number of parallel builders for mesos (#5642) --- mesos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesos.sh b/mesos.sh index 256f327114..8a1fd2e305 100644 --- a/mesos.sh +++ b/mesos.sh @@ -42,7 +42,7 @@ cd build --with-rapidjson=${RAPIDJSON_ROOT} # We build with fewer jobs to avoid OOM errors in GCC -make -j 6 +make -j $((JOBS / 2)) make install From e809f71126416aae58db213e54e455da9e6fc857 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Thu, 26 Sep 2024 06:35:30 +0200 Subject: [PATCH 10/18] Auto-update: defaults-o2.sh o2pdpsuite.sh o2physics.sh o2.sh o2dpg.sh --- o2.sh | 2 +- o2dpg.sh | 2 +- o2pdpsuite.sh | 2 +- o2physics.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/o2.sh b/o2.sh index 22f7d53ae5..d6ff4710cb 100644 --- a/o2.sh +++ b/o2.sh @@ -1,6 +1,6 @@ package: O2 version: "%(tag_basename)s" -tag: "daily-20240925-0200" +tag: "daily-20240926-0200" requires: - abseil - arrow diff --git a/o2dpg.sh b/o2dpg.sh index cdf04c5412..831d315f89 100644 --- a/o2dpg.sh +++ b/o2dpg.sh @@ -1,6 +1,6 @@ package: O2DPG version: "%(tag_basename)s" -tag: "daily-20240925-0200" +tag: "daily-20240926-0200" source: https://github.com/AliceO2Group/O2DPG.git build_requires: - alibuild-recipe-tools diff --git a/o2pdpsuite.sh b/o2pdpsuite.sh index ba76bf1aa7..8ad9627b5a 100644 --- a/o2pdpsuite.sh +++ b/o2pdpsuite.sh @@ -1,6 +1,6 @@ package: O2PDPSuite version: "%(tag_basename)s" -tag: "daily-20240925-0200" +tag: "daily-20240926-0200" requires: # List important packages separately, even though they're also # pulled in by O2sim, so they show up in the dependency list on Monalisa. diff --git a/o2physics.sh b/o2physics.sh index c2aec5d504..a5377d3b4d 100644 --- a/o2physics.sh +++ b/o2physics.sh @@ -1,6 +1,6 @@ package: O2Physics version: "%(tag_basename)s" -tag: "daily-20240925-0200" +tag: "daily-20240926-0200" requires: - O2 - ONNXRuntime From e432e7113c60113b185f559441bb13859540eccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Thu, 26 Sep 2024 14:52:58 +0200 Subject: [PATCH 11/18] Bump qualitycontrol to v1.160.0 (#5643) Co-authored-by: o2bot --- qualitycontrol.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qualitycontrol.sh b/qualitycontrol.sh index 90abe97dc7..8129b65a4e 100644 --- a/qualitycontrol.sh +++ b/qualitycontrol.sh @@ -1,6 +1,6 @@ package: QualityControl version: "%(tag_basename)s" -tag: v1.159.1 +tag: v1.160.0 requires: - boost - "GCC-Toolchain:(?!osx)" From 25d0b2f8577e169c4578fb09306e5924a1993041 Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Thu, 26 Sep 2024 15:39:26 +0200 Subject: [PATCH 12/18] Bump AliECS to v1.20.0 (#5644) --- coconut.sh | 2 +- control-core.sh | 2 +- control-occplugin.sh | 2 +- control.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coconut.sh b/coconut.sh index 56881ddda1..601724464c 100644 --- a/coconut.sh +++ b/coconut.sh @@ -1,6 +1,6 @@ package: coconut version: "%(tag_basename)s" -tag: "v1.19.1" +tag: "v1.20.0" build_requires: - golang - protobuf diff --git a/control-core.sh b/control-core.sh index 582935fa45..3b62143235 100644 --- a/control-core.sh +++ b/control-core.sh @@ -1,6 +1,6 @@ package: Control-Core version: "%(tag_basename)s" -tag: "v1.19.1" +tag: "v1.20.0" build_requires: - "GCC-Toolchain:(?!osx)" - golang diff --git a/control-occplugin.sh b/control-occplugin.sh index b354d9b24e..3071e551eb 100644 --- a/control-occplugin.sh +++ b/control-occplugin.sh @@ -1,6 +1,6 @@ package: Control-OCCPlugin version: "%(tag_basename)s" -tag: "v1.19.1" +tag: "v1.20.0" requires: - FairMQ - FairLogger diff --git a/control.sh b/control.sh index c3064b4525..21d468b93b 100644 --- a/control.sh +++ b/control.sh @@ -1,5 +1,5 @@ package: Control -version: "v1.19.1" +version: "v1.20.0" requires: - Control-Core - Control-OCCPlugin From 451829d7866d14915aa2e0469dde13db0da1b5c4 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:56:08 +0200 Subject: [PATCH 13/18] v5-09-60* tags are the new ones from master (#5647) --- .github/workflows/prepare-patch-release-branch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-patch-release-branch.yml b/.github/workflows/prepare-patch-release-branch.yml index 2be162d65d..48394cdac3 100644 --- a/.github/workflows/prepare-patch-release-branch.yml +++ b/.github/workflows/prepare-patch-release-branch.yml @@ -21,7 +21,7 @@ jobs: id: decide_release_branch run: | case "$TAG" in - v5-09-59*) echo branch=master ;; + v5-09-60*) echo branch=master ;; *) echo "branch=$(echo "AliPhysics-$TAG-01-patches" | sed -r 's/[a-z]+-01-patches$/-01-patches/')" ;; esac >> "$GITHUB_OUTPUT" env: From 00f9650c2834e0357894142e8c6dc985ceafa20d Mon Sep 17 00:00:00 2001 From: Michele Donadoni <58817706+donidona@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:19:08 +0200 Subject: [PATCH 14/18] DimRpcParallel v0.1.2 -> v0.1.3 (#5636) --- dimrpcparallel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dimrpcparallel.sh b/dimrpcparallel.sh index 12ac516773..36b1abf086 100644 --- a/dimrpcparallel.sh +++ b/dimrpcparallel.sh @@ -1,6 +1,6 @@ package: DimRpcParallel version: "%(tag_basename)s" -tag: v0.1.2 +tag: v0.1.3 requires: - "dim:(?!osx)" - "GCC-Toolchain:(?!osx)" From b0be4a10cc48a07e5ef59804363a20210cf8d41b Mon Sep 17 00:00:00 2001 From: sy-c Date: Thu, 26 Sep 2024 18:04:05 +0200 Subject: [PATCH 15/18] bump infologger+common (#5645) * bump common * Update infologger.sh * Update libinfologger.sh --- common-o2.sh | 2 +- infologger.sh | 2 +- libinfologger.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common-o2.sh b/common-o2.sh index d6ab1415d3..458c6c0eea 100644 --- a/common-o2.sh +++ b/common-o2.sh @@ -1,6 +1,6 @@ package: Common-O2 version: "%(tag_basename)s" -tag: v1.6.2 +tag: v1.6.3 requires: - boost - "GCC-Toolchain:(?!osx)" diff --git a/infologger.sh b/infologger.sh index 9cf2c311b8..d45650a4d6 100644 --- a/infologger.sh +++ b/infologger.sh @@ -1,6 +1,6 @@ package: InfoLogger version: "%(tag_basename)s" -tag: v2.7.1 +tag: v2.7.2 requires: - boost - "GCC-Toolchain:(?!osx)" diff --git a/libinfologger.sh b/libinfologger.sh index 86b2f90892..c7f1ee0fdc 100644 --- a/libinfologger.sh +++ b/libinfologger.sh @@ -1,6 +1,6 @@ package: libInfoLogger version: "%(tag_basename)s" -tag: v2.7.1 +tag: v2.7.2 requires: - boost - "GCC-Toolchain:(?!osx)" From 80294c05818ecb507ee80d5d6d18f3aac34c95b9 Mon Sep 17 00:00:00 2001 From: sy-c Date: Thu, 26 Sep 2024 18:45:13 +0200 Subject: [PATCH 16/18] bump readoutcard (#5646) --- readoutcard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readoutcard.sh b/readoutcard.sh index 290e4f69ad..f673595911 100644 --- a/readoutcard.sh +++ b/readoutcard.sh @@ -1,6 +1,6 @@ package: ReadoutCard version: "%(tag_basename)s" -tag: v0.45.3 +tag: v0.45.4 requires: - boost - "GCC-Toolchain:(?!osx)" From e289c1305d41d2f3b7d23b8156b0c8f7b2892d69 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Fri, 27 Sep 2024 03:53:25 +0200 Subject: [PATCH 17/18] Auto-update: defaults-o2.sh o2pdpsuite.sh o2physics.sh o2.sh o2dpg.sh --- o2.sh | 2 +- o2dpg.sh | 2 +- o2pdpsuite.sh | 2 +- o2physics.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/o2.sh b/o2.sh index d6ff4710cb..1f436624ea 100644 --- a/o2.sh +++ b/o2.sh @@ -1,6 +1,6 @@ package: O2 version: "%(tag_basename)s" -tag: "daily-20240926-0200" +tag: "daily-20240927-0200" requires: - abseil - arrow diff --git a/o2dpg.sh b/o2dpg.sh index 831d315f89..d6dcecc616 100644 --- a/o2dpg.sh +++ b/o2dpg.sh @@ -1,6 +1,6 @@ package: O2DPG version: "%(tag_basename)s" -tag: "daily-20240926-0200" +tag: "daily-20240927-0200" source: https://github.com/AliceO2Group/O2DPG.git build_requires: - alibuild-recipe-tools diff --git a/o2pdpsuite.sh b/o2pdpsuite.sh index 8ad9627b5a..4bb54c9366 100644 --- a/o2pdpsuite.sh +++ b/o2pdpsuite.sh @@ -1,6 +1,6 @@ package: O2PDPSuite version: "%(tag_basename)s" -tag: "daily-20240926-0200" +tag: "daily-20240927-0200" requires: # List important packages separately, even though they're also # pulled in by O2sim, so they show up in the dependency list on Monalisa. diff --git a/o2physics.sh b/o2physics.sh index a5377d3b4d..de4ddf6430 100644 --- a/o2physics.sh +++ b/o2physics.sh @@ -1,6 +1,6 @@ package: O2Physics version: "%(tag_basename)s" -tag: "daily-20240926-0200" +tag: "daily-20240927-0200" requires: - O2 - ONNXRuntime From 36277e42a04592a104e1dfb9b85827b3401a7411 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Fri, 27 Sep 2024 09:04:37 +0200 Subject: [PATCH 18/18] Make clang a normal tool on mac If we find a **known to be compatible** tool, we use it, otherwise we do not play tricks just to stay on the latest version provided by brew. --- arrow.sh | 20 ++++++++------------ clang.sh | 3 +++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arrow.sh b/arrow.sh index d1b1661750..4951acbb41 100644 --- a/arrow.sh +++ b/arrow.sh @@ -5,7 +5,7 @@ source: https://github.com/alisw/arrow.git requires: - boost - lz4 - - Clang:(?!.*osx) + - Clang - protobuf - utf8proc - OpenSSL:(?!osx) @@ -19,6 +19,7 @@ build_requires: - double-conversion - re2 - alibuild-recipe-tools + - ninja env: ARROW_HOME: "$ARROW_ROOT" --- @@ -58,17 +59,12 @@ esac mkdir -p ./src_tmp rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./src_tmp/ - case $ARCHITECTURE in osx*) - # use default llvm from homebrew if available - if [ -d "$(brew --prefix llvm)" ]; then - CLANG_EXECUTABLE="$(brew --prefix llvm)/bin/clang" - else - # fall back to llvm@17 - if [ -d "$(brew --prefix llvm)@17" ]; then - CLANG_EXECUTABLE="$(brew --prefix llvm)@17/bin/clang" - fi + # use compatible llvm@18 from brew, if available. This + # must match the prefer_system_check in clang.sh + if [ -d "$(brew --prefix llvm)@18" ]; then + CLANG_EXECUTABLE="$(brew --prefix llvm)@18/bin/clang" fi ;; *) @@ -81,6 +77,7 @@ esac cmake ./src_tmp/cpp \ ${CMAKE_SHARED_LINKER_FLAGS:+-DCMAKE_SHARED_LINKER_FLAGS="$CMAKE_SHARED_LINKER_FLAGS"} \ -DARROW_DEPENDENCY_SOURCE=SYSTEM \ + -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \ -DBUILD_SHARED_LIBS=TRUE \ @@ -125,8 +122,7 @@ cmake ./src_tmp/cpp -DCLANG_EXECUTABLE="$CLANG_EXECUTABLE" \ ${GCC_TOOLCHAIN_REVISION:+-DGCC_TOOLCHAIN_ROOT=`find "$GCC_TOOLCHAIN_ROOT/lib" -name crtbegin.o -exec dirname {} \;`} -make ${JOBS:+-j $JOBS} -make install +cmake --build . -- ${JOBS:+-j $JOBS} install find "$INSTALLROOT/share" -name '*-gdb.py' -exec mv {} "$INSTALLROOT/lib" \; # Modulefile diff --git a/clang.sh b/clang.sh index 6d9759431b..c5bb69ca58 100644 --- a/clang.sh +++ b/clang.sh @@ -12,6 +12,9 @@ build_requires: - ninja env: LLVM_ROOT: "$CLANG_ROOT" # needed by LLVMAlt +prefer_system: (osx.*) +prefer_system_check: + test -d $(brew --prefix llvm@18) --- #!/bin/bash -e