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.
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
fix builds for macos 12.6 #18642
fix builds for macos 12.6 #18642
Conversation
@@ -2346,7 +2346,7 @@ IF (NOT WIN32) | |||
SET (CPACK_BUNDLE_PLIST "${VISIT_BINARY_DIR}/tools/dev/scripts/Info.plist") | |||
SET (CPACK_BUNDLE_STARTUP_COMMAND "${VISIT_BINARY_DIR}/exe/visit_macos_launcher") | |||
ELSE(APPLE AND VISIT_CREATE_APPBUNDLE_PACKAGE) | |||
SET(CPACK_GENERATOR "TGZ") | |||
SET(CPACK_GENERATOR "TXZ") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change leads to 100Mb smaller tarball on mac. Would assume similar savings on other platforms. If we could control flags to xz, we could improve that a bit more. We could do that if we used Python tools to tar and compress...as we do in the top level data
dir.
cmd = "hdiutil create -srcFolder %s -o %s" % (src_folder, temp_dmg) | ||
# ULMO format (xz) is 1/2 the size of default format (UDZO which is zlib level 1) | ||
#cmd = "hdiutil create -srcFolder %s -o %s" % (src_folder, temp_dmg) | ||
cmd = "hdiutil create -format ULMO -srcFolder %s -o %s" % (src_folder, temp_dmg) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change leads to 275Mb smaller .dmg
file on mac
export MPICH_URL=${MPICH_URL:-http://www.mpich.org/static/tarballs/${MPICH_VERSION}} | ||
export MPICH_MD5_CHECKSUM="9ed4cabd3fb86525427454381b25f6af" | ||
export MPICH_SHA256_CHECKSUM="fe551ef29c8eea8978f679484441ed8bb1d943f6ad25b63c235d4b9243d551e5" | ||
if [[ "$OPSYS" == "Darwin" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updating mpich with newer libtool involves quite a bit. No easy way to just patch it. So, I created a new third-party
asset named mpich-3.3.1-libtool-2.4.6
which expands also to mpich-3.3.1
(honestly should be harmless if its used on non-macOS systems too).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit is needed for macOS 12.6. So I cherry picked it to #19293
sed -i orig -e 's/^main()/int main()/' configure | ||
else | ||
sed -i.orig -e 's/^main()/int main()/' configure | ||
fi | ||
info "Invoking command to configure AdvIO" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Many try-run blocks for sizes of types in configure defined a main()
with no type which causes modern compilers to fail outright. This sed
command fixes them. Its a little different on macOS then other *nix systems. Windows?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@markcmiller86 Sorry, didn't see the question about Windows sooner. Not using the build_visit script on Windows, so not an issue.
Ok, so my attempt to build from a fresh state for this branch did fail in Qt. And I need to investigate and fix. |
The problem with Qt5 on macOS is that it does not support python3. It requires a python2 (for at least QtWebEngine anyways...maybe we should explicitly disable that?). On my macOS 12.6.7, with a vanilla |
I wound up having to add |
There is a patch in bv_qt.sh that should handle the python issue, but it is only applied for Qt 5.10.1. It looks like it should also be added for Qt 5.14.2. visit/src/tools/dev/scripts/bv_support/bv_qt.sh Lines 287 to 296 in 02e4b02
|
PR #18848 will include the changes for macOS. |
Description
Resolves #
Type of change
How Has This Been Tested?
Reminders:
Checklist: