Skip to content

Commit

Permalink
Make UUID dependency of XRootD on Mac explicit
Browse files Browse the repository at this point in the history
On Mac, we use our UUID anyway since we depend on AliEn-Runtime, which depends
on UUID, and UUID sets PKG_CONFIG_PATH so we find it even with UUID_ROOT
unset.

This is counter-intuitive, so stop fiddling with UUID_ROOT manually.
  • Loading branch information
TimoWilken committed Jul 7, 2023
1 parent 4580360 commit 627f559
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions xrootd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build_requires:
- CMake
- "osx-system-openssl:(osx.*)"
- "GCC-Toolchain:(?!osx)"
- UUID:(?!osx)
- UUID
- alibuild-recipe-tools
prepend_path:
PYTHONPATH: "${XROOTD_ROOT}/lib/python/site-packages"
Expand Down Expand Up @@ -44,7 +44,6 @@ case $ARCHITECTURE in
# This seems to be a robust way to discover a working SDK path and present it to Python setuptools.
# This fix is needed only on MacOS when building XRootD Python bindings.
export CFLAGS="${CFLAGS} -isysroot $(xcrun --show-sdk-path)"
unset UUID_ROOT
COMPILER_CC=clang
COMPILER_CXX=clang++
COMPILER_LD=clang
Expand All @@ -57,7 +56,6 @@ case $ARCHITECTURE in
# This seems to be a robust way to discover a working SDK path and present it to Python setuptools.
# This fix is needed only on MacOS when building XRootD Python bindings.
export CFLAGS="${CFLAGS} -isysroot $(xcrun --show-sdk-path)"
unset UUID_ROOT
COMPILER_CC=clang
COMPILER_CXX=clang++
COMPILER_LD=clang
Expand Down

0 comments on commit 627f559

Please sign in to comment.