Get ROOT to compile with new macOS / XCode (#5832)

ktf · web-flow · commit 5ef587babb70 · 2025-04-08T11:03:27.000+02:00
* Proper rsync in case the sources are not writeable
* Bump zlib version
* Use proper tag for UUID
* Do not build HDF5 tests
* Add missing protobuf tag
* Cleanup XRootD
* Improve reproducibility
* Compile GEANT4
* Make ROOT libpng compile
* Get ONNXRuntime to compile with the new macOS
* Use proper fastjet as baseline
diff --git a/apmon-cpp.sh b/apmon-cpp.sh
@@ -8,7 +8,7 @@ build_requires:
   - "GCC-Toolchain:(?!osx)"
 ---
 #!/bin/bash -e
-rsync -a --exclude='**/.git' --delete --delete-excluded \
+rsync -a --chmod=ug=rwX --exclude='**/.git' --delete --delete-excluded \
       $SOURCEDIR/ ./
 autoreconf -ivf
 
diff --git a/arrow.sh b/arrow.sh
@@ -58,7 +58,7 @@ esac
 #   boost
 
 mkdir -p ./src_tmp
-rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./src_tmp/
+rsync -a --chmod=ug=rwX --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./src_tmp/
 case $ARCHITECTURE in
   osx*)
    # use compatible llvm@18 from brew, if available. This
@@ -106,7 +106,8 @@ cmake ./src_tmp/cpp
       ${UTF8PROC_ROOT:+-Dutf8proc_ROOT="$UTF8PROC_ROOT"}                                            \
       ${OPENSSL_ROOT:+-DOpenSSL_ROOT="$OPENSSL_ROOT"}                                               \
       ${CLANG_ROOT:+-DLLVM_DIR="$CLANG_ROOT"}                                                       \
-      ${PYTHON_ROOT:+-DPython3_EXECUTABLE="$(which python3)"}                               \
+      ${PYTHON_ROOT:+-DPython3_EXECUTABLE="$(which python3)"}                                       \
+      ${XSIMD_REVISION:+-Dxsimd_DIR=${XSIMD_ROOT}}                                                  \
       -DARROW_WITH_SNAPPY=OFF                                                                       \
       -DARROW_WITH_ZSTD=OFF                                                                         \
       -DARROW_WITH_BROTLI=OFF                                                                       \
@@ -120,8 +121,8 @@ cmake ./src_tmp/cpp
       -DARROW_FILESYSTEM=ON                                                                         \
       -DARROW_BUILD_STATIC=OFF                                                                      \
       -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON                                                        \
-      -DCLANG_EXECUTABLE="$CLANG_EXECUTABLE"                                                        \
-      ${GCC_TOOLCHAIN_REVISION:+-DGCC_TOOLCHAIN_ROOT=`find "$GCC_TOOLCHAIN_ROOT/lib" -name crtbegin.o -exec dirname {} \;`}
+      ${GCC_TOOLCHAIN_REVISION:+-DGCC_TOOLCHAIN_ROOT="$(find "$GCC_TOOLCHAIN_ROOT/lib"-name crtbegin.o -exec dirname {} \;)"} \
+      -DCLANG_EXECUTABLE="$CLANG_EXECUTABLE"
 
 cmake --build . -- ${JOBS:+-j $JOBS} install
 find "$INSTALLROOT/share" -name '*-gdb.py' -exec mv {} "$INSTALLROOT/lib" \;
diff --git a/boost.sh b/boost.sh
@@ -58,7 +58,7 @@ case $ARCHITECTURE in
   *) TOOLSET=gcc ;;
 esac
 
-rsync -a "$SOURCEDIR"/ "$BUILDDIR"/
+rsync -a --no-specials --no-devices  --chmod=ug=rwX --exclude '**/.git' --delete --delete-excluded "$SOURCEDIR"/ "$BUILDDIR"/
 cd "$BUILDDIR"/tools/build
 # This is to work around an issue in boost < 1.70 where the include path misses
 # the ABI suffix. E.g. ../include/python3 rather than ../include/python3m.
@@ -120,4 +120,4 @@ alibuild-generate-module --lib --cmake > etc/modulefiles/"$PKGNAME"
 cat << EOF >> etc/modulefiles/"$PKGNAME"
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF
-mkdir -p "$INSTALLROOT"/etc/modulefiles && rsync -a --delete etc/modulefiles/ "$INSTALLROOT"/etc/modulefiles
+mkdir -p "$INSTALLROOT"/etc/modulefiles && rsync -a --no-specials --no-devices  --delete etc/modulefiles/ "$INSTALLROOT"/etc/modulefiles
diff --git a/clang.sh b/clang.sh
@@ -44,6 +44,8 @@ cmake "$SOURCEDIR/llvm" \
   -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi' \
   -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD:?}" \
   -DCMAKE_BUILD_TYPE=Release \
+  ${COMPILER_RT_OSX_ARCHS:+-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON} \
+  ${COMPILER_RT_OSX_ARCHS:+-DCOMPILER_RT_OSX_ARCHS=${COMPILER_RT_OSX_ARCHS}} \
   -DCMAKE_INSTALL_PREFIX:PATH="$INSTALLROOT" \
   -DLLVM_INSTALL_UTILS=ON \
   -DPYTHON_EXECUTABLE="$(which python3)" \
diff --git a/cmake.sh b/cmake.sh
@@ -5,6 +5,8 @@ source: https://github.com/Kitware/CMake
 requires:
   - "OpenSSL:(?!osx)"
   - "GCC-Toolchain:(?!osx)"
+  - zlib
+  - curl
 build_requires:
   - make
   - alibuild-recipe-tools
@@ -21,6 +23,10 @@ prefer_system_replacement_specs:
       CMAKE_VERSION: ""
 ---
 #!/bin/bash -e
+SONAME=so
+case $ARCHITECTURE in
+  osx*) SONAME=dylib ;;
+esac
 
 cat > build-flags.cmake <<- EOF
 # Disable Java capabilities; we don't need it and on OS X might miss the
@@ -29,13 +35,24 @@ SET(JNI_H FALSE CACHE BOOL "" FORCE)
 SET(Java_JAVA_EXECUTABLE FALSE CACHE BOOL "" FORCE)
 SET(Java_JAVAC_EXECUTABLE FALSE CACHE BOOL "" FORCE)
 
+SET(ZLIB_LIBRARY $ZLIB_ROOT/lib/libz.$SONAME)
+SET(ZLIB_INCLUDE_DIR $ZLIB_ROOT/include)
+
+SET(CURL_LIBRARY $CURL_ROOT/lib/libcurl.$SONAME)
+SET(CURL_INCLUDE_DIR $CURL_ROOT/include)
+SET(BUILD_TESTING OFF)
+
 # SL6 with GCC 4.6.1 and LTO requires -ltinfo with -lcurses for link to succeed,
 # but cmake is not smart enough to find it. We do not really need ccmake anyway,
 # so just disable it.
 SET(BUILD_CursesDialog FALSE CACHE BOOL "" FORCE)
 EOF
 
-$SOURCEDIR/bootstrap --prefix=$INSTALLROOT \
+rsync -a --chmod=ugo=rwX --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
+
+./bootstrap --prefix=$INSTALLROOT \
+                     ${ZLIB_ROOT:+--no-system-zlib} \
+                     ${CURL_ROOT:+--no-system-curl} \
                      --init=build-flags.cmake \
                      ${JOBS:+--parallel=$JOBS}
 make ${JOBS+-j $JOBS}
diff --git a/curl.sh b/curl.sh
@@ -4,7 +4,6 @@ tag: curl-7_70_0
 source: https://github.com/curl/curl.git
 build_requires:
   - "OpenSSL:(?!osx)"
-  - CMake
   - alibuild-recipe-tools
 ---
 #!/bin/bash -e
@@ -14,7 +13,7 @@ if [[ $ARCHITECTURE = osx* ]]; then
 else
   ${OPENSSL_ROOT:+env LDFLAGS=-Wl,-R$OPENSSL_ROOT/lib}
 fi
-rsync -av --delete --exclude="**/.git" $SOURCEDIR/ .
+rsync -a --chmod=ug=rwX  --delete --exclude="**/.git" --delete-excluded $SOURCEDIR/ .
 
 sed -i.deleteme 's/CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"/CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"/' configure.ac
 sed -i.deleteme 's/LDFLAGS="$LDFLAGS $SSL_LDFLAGS"/LDFLAGS="$SSL_LDFLAGS $LDFLAGS"/' configure.ac
diff --git a/defaults-o2.sh b/defaults-o2.sh
@@ -27,8 +27,6 @@ overrides:
       - JAliEn-ROOT
   cgal:
     version: 4.12.2
-  fastjet:
-    tag: v3.4.1_1.052-alice2
 ---
 # This file is included in any build recipe and it's only used to set
 # environment variables. Which file to actually include can be defined by the
diff --git a/fastjet.sh b/fastjet.sh
@@ -1,6 +1,6 @@
 package: fastjet
 version: "%(tag_basename)s"
-tag: "v3.2.1_1.024-alice3"
+tag: "v3.4.1_1.052-alice3"
 source: https://github.com/alisw/fastjet
 requires:
   - cgal
diff --git a/freetype.sh b/freetype.sh
@@ -13,7 +13,9 @@ prefer_system_check: |
   if [ $? -ne 0 ]; then printf "FreeType is missing on your system.\n * On RHEL-compatible systems you probably need: freetype freetype-devel\n * On Ubuntu-compatible systems you probably need: libfreetype6 libfreetype6-dev\n"; exit 1; fi
 ---
 #!/bin/bash -ex
-rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./
+rsync -a --chmod=ug=rwX --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./
+type libtoolize && export LIBTOOLIZE=libtoolize
+type glibtoolize && export LIBTOOLIZE=glibtoolize
 sh autogen.sh
 ./configure --prefix="$INSTALLROOT"              \
             --with-png=no                        \
diff --git a/geant4.sh b/geant4.sh
@@ -1,11 +1,12 @@
 package: GEANT4
 version: "%(tag_basename)s"
-tag: "v11.2.0"
+tag: "v11.3.0"
 # source: https://github.com/alisw/geant4.git
 source: https://gitlab.cern.ch/geant4/geant4.git
 requires:
   - "GCC-Toolchain:(?!osx)"
   - xercesc
+  - zlib
 build_requires:
   - CMake
   - "Xcode:(osx.*)"
@@ -46,15 +47,18 @@ cmake $SOURCEDIR                                                \
   ${XERCESC_ROOT:+-DXERCESC_ROOT_DIR=$XERCESC_ROOT}             \
   ${CXXSTD:+-DGEANT4_BUILD_CXXSTD=$CXXSTD}                      \
   -DG4_USE_GDML=ON                                              \
-  -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+  -DCMAKE_EXPORT_COMPILE_COMMANDS=ON                            \
+  -DGEANT4_USE_SYSTEM_ZLIB=ON
 
 
 make ${JOBS+-j $JOBS}
 make install
 
 # we should not use cached package links
 packagecachefile=$(find ${INSTALLROOT} -name "Geant4PackageCache.cmake")
-echo "#" > $packagecachefile
+if [ -f "$packagecachefile" ]; then
+    echo "#" > $packagecachefile
+fi
 
 # Install data sets
 # Can be done after Geant4 installation, if installed with -DGEANT4_INSTALL_DATA=OFF
diff --git a/geant4_vmc.sh b/geant4_vmc.sh
@@ -1,6 +1,6 @@
 package: GEANT4_VMC
 version: "%(tag_basename)s"
-tag: "v6-6-p3"
+tag: "v6-7-p1"
 source: https://github.com/vmc-project/geant4_vmc
 requires:
   - ROOT
diff --git a/hdf5.sh b/hdf5.sh
@@ -15,8 +15,9 @@ env:
 ---
 #!/bin/bash -e
   cmake "$SOURCEDIR"                             \
-    -DCMAKE_CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+    -DCMAKE_CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \
     -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"        \
+    -DBUILD_TESTING=OFF                          \
     ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}      \
     -DHDF5_BUILD_CPP_LIB=ON
 
diff --git a/lhapdf.sh b/lhapdf.sh
@@ -23,7 +23,7 @@ case $ARCHITECTURE in
   ;;
 esac
 
-rsync -a --exclude '**/.git' $SOURCEDIR/ ./
+rsync -a --chmod=ug=rwX --exclude '**/.git' $SOURCEDIR/ ./
 
 export LIBRARY_PATH="$LD_LIBRARY_PATH"
 
@@ -53,7 +53,7 @@ pushd "$INSTALLROOT"
   fi
   # Uniform Python library path
   pushd lib
-    ln -nfs python* python
+    find $PWD -name "python3*" -exec ln -nfs {} python \;
   popd
 popd
 
diff --git a/libpng.sh b/libpng.sh
@@ -1,10 +1,10 @@
 package: libpng
-version: v1.6.34
+version: v1.6.47
 requires:
   - zlib
 build_requires:
   - CMake
-source: https://github.com/alisw/libpng
+source: https://github.com/pnggroup/libpng
 prefer_system: (?!slc5)
 prefer_system_check: |
   printf "#include <png.h>\n" | c++ -xc++ - `libpng-config --cflags` -c -M 2>&1
@@ -14,6 +14,7 @@ prefer_system_check: |
 rsync -a $SOURCEDIR/ .
 cmake .                                        \
     -DCMAKE_INSTALL_PREFIX:PATH=$INSTALLROOT   \
+    -DCMAKE_CXX_STANDARD=${CXXSTD}             \
     -DBUILD_SHARED_LIBS=YES                    \
     ${ZLIB_ROOT:+-DZLIB_ROOT:PATH=$ZLIB_ROOT}  \
     -DCMAKE_SKIP_RPATH=YES                     \
diff --git a/onnxruntime.sh b/onnxruntime.sh
@@ -108,6 +108,8 @@ cmake "$SOURCEDIR/cmake"
       -DFETCHCONTENT_QUIET=OFF                                                                              \
       -DCMAKE_POLICY_DEFAULT_CMP0170=NEW                                                                    \
       -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS                                                           \
+      -DCMAKE_SHARED_LINKER_FLAGS='-Wl,-undefined,dynamic_lookup' \
+      -DCMAKE_EXE_LINKER_FLAGS='-Wl,-undefined,dynamic_lookup' \
       -Dsafeint_SOURCE_DIR=${SAFE_INT_ROOT}/include                                                         \
       -Deigen_SOURCE_PATH=${EIGEN3_ROOT}/include/eigen3                                                     \
       -DGIT_EXECUTABLE=$(type git)                                                                          \
diff --git a/protobuf.sh b/protobuf.sh
@@ -1,5 +1,6 @@
 package: protobuf
 version: v29.3
+tag: v29.3
 source: https://github.com/protocolbuffers/protobuf
 build_requires:
   - CMake
diff --git a/pythia.sh b/pythia.sh
@@ -11,7 +11,7 @@ env:
   PYTHIA8: "$PYTHIA_ROOT"
 ---
 #!/bin/bash -e
-rsync -a $SOURCEDIR/ ./
+rsync -a --chmod=ug=rwX --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
 case $ARCHITECTURE in
   osx*)
     # If we preferred system tools, we need to make sure we can pick them up.
diff --git a/pytorch_cpuinfo.sh b/pytorch_cpuinfo.sh
@@ -1,6 +1,6 @@
 package: pytorch_cpuinfo
 version: "alice1"
-tag: b73ae6c
+tag: b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea
 source: https://github.com/pytorch/cpuinfo
 requires:
   - "GCC-Toolchain:(?!osx)"
diff --git a/root.sh b/root.sh
@@ -1,6 +1,6 @@
 package: ROOT
 version: "%(tag_basename)s"
-tag: "v6-32-06-alice1"
+tag: "v6-32-06-alice7"
 source: https://github.com/alisw/root.git
 requires:
   - arrow
diff --git a/uuid.sh b/uuid.sh
@@ -1,14 +1,14 @@
 package: UUID
 version: v2.27.1
-tag: alice/v2.27.1
+tag: v2.27.1-alice1
 source: https://github.com/alisw/uuid
 build_requires:
   - "GCC-Toolchain:(?!osx)"
   - "autotools:(slc6|slc7)"
 prepend_path:
   PKG_CONFIG_PATH: "$UUID_ROOT/share/pkgconfig"
 ---
-rsync -av --delete --exclude '**/.git' "$SOURCEDIR/" .
+rsync --no-specials --no-devices --chmod=ug=rwX -av --delete --exclude .git/ --delete-excluded "$SOURCEDIR/" .
 if [[ $AUTOTOOLS_ROOT == "" ]]  && which brew >/dev/null; then
   PATH=$PATH:$(brew --prefix gettext)/bin
 fi
diff --git a/xrootd.sh b/xrootd.sh
@@ -7,6 +7,7 @@ requires:
   - Python-modules
   - AliEn-Runtime
   - libxml2
+  - zlib
 build_requires:
   - CMake
   - "osx-system-openssl:(osx.*)"
@@ -45,6 +46,9 @@ libuuid_soname=$SONAME
 case $ARCHITECTURE in
   osx_*)
     [[ $OPENSSL_ROOT ]] || OPENSSL_ROOT=$(brew --prefix openssl@3)
+    # Find where ZLIB is defined
+    [[ $ZLIB_ROOT ]] || ZLIB_ROOT="$(brew --prefix zlib)"
+    [[ -d "$ZLIB_ROOT" ]] || unset ZLIB_ROOT
     # Python from Homebrew will have a hardcoded sysroot pointing to the
     # Xcode.app directory, which might not exist. This seems to be a robust
     # way to discover a working SDK path and present it to Python setuptools.
@@ -60,14 +64,11 @@ esac
 
 case $ARCHITECTURE in
   osx_x86-64) export ARCHFLAGS="-arch x86_64" ;;
-  osx_arm64) CMAKE_FRAMEWORK_PATH=$(brew --prefix)/Frameworks ;;
+  osx_arm64) CMAKE_FRAMEWORK_PATH=$(brew --prefix python)/Frameworks ;;
 esac
 
-rsync -a --delete ${SOURCEDIR}/ ${BUILDDIR}
-
-mkdir build
-pushd build
-cmake "${BUILDDIR}"                                                   \
+cd $BUILDDIR
+cmake "${SOURCEDIR}"                                                  \
       --log-level DEBUG                                               \
       ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                       \
       -DCMAKE_CXX_COMPILER=$COMPILER_CXX                              \
@@ -95,7 +96,6 @@ cmake "${BUILDDIR}"                                                   \
       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-Wno-error"
 
 cmake --build . -- ${JOBS:+-j$JOBS} install
-popd
 
 if [[ x"$XROOTD_PYTHON" == x"True" ]]; then
     pushd ${INSTALLROOT}
diff --git a/zlib.sh b/zlib.sh
@@ -1,6 +1,6 @@
 package: zlib
 version: "%(tag_basename)s"
-tag: v1.2.13
+tag: v1.3.1
 source: https://github.com/madler/zlib
 build_requires:
   - "GCC-Toolchain:(?!osx)"
@@ -9,7 +9,7 @@ prefer_system: "(?!slc5)"
 prefer_system_check: |
   printf "#include <zlib.h>\n" | cc -xc - -c -M 2>&1
 ---
-rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
+rsync -a --chmod=ug=rwX --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
 
 ./configure --prefix="$INSTALLROOT"
 
