Skip to content
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

[v632] Fix macOS15.4 builds #18245

Merged
merged 5 commits into from
Apr 5, 2025
Merged

[v632] Fix macOS15.4 builds #18245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae058e1
Fix build issue on macOS 15.4 / XCode 16.3
ktf Apr 2, 2025
f89e83e
[runtime-cxxmodules] Adapt the darwin modulemaps to sdk 15.4. (#18231)
vgvassilev Apr 3, 2025
efe685b
[cling][JIT] Inject compiler-rt complex division symbols on macOS
devajithvs Apr 3, 2025
a71412e
[graf] Patch libAsimage: fp.h is now part of math.h
dpiparo Apr 3, 2025
004d354
[cmake] Update the version of VDT to 0.4.6
dpiparo Apr 4, 2025
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
4 changes: 2 additions & 2 deletions cmake/modules/SearchInstalledSoftware.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,13 +1477,13 @@ if(vdt OR builtin_vdt)
endif()
endif()
if(builtin_vdt)
set(vdt_version 0.4.4)
set(vdt_version 0.4.6)
set(VDT_FOUND True)
set(VDT_LIBRARIES ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}vdt${CMAKE_SHARED_LIBRARY_SUFFIX})
ExternalProject_Add(
VDT
URL ${lcgpackages}/vdt-${vdt_version}.tar.gz
URL_HASH SHA256=8b1664b45ec82042152f89d171dd962aea9bb35ac53c8eebb35df1cb9c34e498
URL_HASH SHA256=1820feae446780763ec8bbb60a0dbcf3ae1ee548bdd01415b1fb905fd4f90c54
INSTALL_DIR ${CMAKE_BINARY_DIR}
CMAKE_ARGS
-DSSE=OFF # breaks on ARM without this
Expand Down
11 changes: 9 additions & 2 deletions core/clingutils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,15 @@ if (runtime_cxxmodules)

# We need to override the default modulemap because instead of producing a
# single std.pcm, produces hundreds of pcms. This changed with sdk 15.3.
if (CMAKE_SYSTEM_NAME MATCHES Darwin AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0.0.15000309)
set(custom_modulemaps ${custom_modulemaps} std_darwin.modulemap)
# we need to patch the modulemap from MacOSX15.2.sdk
if (APPLE)
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0.0.15000309)
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17.0.0.17000013)
set(custom_modulemaps ${custom_modulemaps} std_darwin.MacOSX15.2.sdk.modulemap)
else()
set(custom_modulemaps ${custom_modulemaps} std_darwin.modulemap)
endif()
endif()
endif()

if (NOT libcxx)
Expand Down
1 change: 1 addition & 0 deletions core/thread/inc/ROOT/RConcurrentHashColl.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

#include <memory>
#include <vector>
#include <functional>
#include "Rtypes.h"

namespace ROOT {
Expand Down
2 changes: 2 additions & 0 deletions graf2d/asimage/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ Some files have been modified compare to the official libAfterImage version:

configure.in: support clang++ by removing some warnings.

libpng/pngpriv.h: fp.h was moved into math.h. This fix was originated by G. Eullisse - ALICE (April 2025)

configure:
- has been modified to look at the ".dylib" file extension to find
the X11 libraries. This is needed on the Mac Leopard system.
Expand Down
14 changes: 2 additions & 12 deletions graf2d/asimage/src/libAfterImage/libpng/pngpriv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,18 +514,8 @@
*/
# include <float.h>

# if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
/* We need to check that <math.h> hasn't already been included earlier
* as it seems it doesn't agree with <fp.h>, yet we should really use
* <fp.h> if possible.
*/
# if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
# include <fp.h>
# endif
# else
# include <math.h>
# endif
# include <math.h>

# if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
/* Amiga SAS/C: We must include builtin FPU functions when compiling using
* MATH=68881
Expand Down
Loading
Loading