-
Notifications
You must be signed in to change notification settings - Fork 567
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
Wizard recipe: charon-v2.2.0 #7383
Wizard recipe: charon-v2.2.0 #7383
Conversation
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.
Note, this currently doesn't build, because our Trilinos build is missing a package. I'll need to fix that first.
C/charon/build_tarballs.jl
Outdated
# Dependencies that must be installed before this package can be built | ||
dependencies = [ | ||
Dependency(PackageSpec(name="Trilinos_jll", uuid="b6fd3212-6f87-5999-b9ea-021e9cd21b17")) | ||
Dependency(PackageSpec(name="CMake_jll")) |
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.
Dependency(PackageSpec(name="CMake_jll")) | |
HostBuildDependency(PackageSpec(name="CMake_jll")) |
-SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Kokkos Panzer PanzerDiscFE PanzerAdaptersSTK STKMesh STKUtil STKTopology SEACASNemesis SEACASExodus SEACASAprepro Stratimikos Piro NOX Rythmos Teko Belos AztecOO) | ||
- | ||
-SET(TEST_REQUIRED_DEP_PACKAGES SEACAS SEACASEpu SEACASExodiff SEACASNemslice SEACASNemspread) | ||
+tribits_package_define_dependencies( |
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.
I don't think this change is strictly required, the issue was the missing TPL listing.
HAVE_${PACKAGE_NAME_UC}_EXPLICIT_INSTANTIATION | ||
"Enable the use of explicit template instantiation (defaults to Panzer value)." | ||
- ${Panzer_ENABLE_EXPLICIT_INSTANTIATION} | ||
+ OFF |
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.
I'm not sure this is still required after I fixed the dependency listing above. Will have to try.
These are dependencies of charon, which I'd like to build (#7383).
aa5b579
to
5163182
Compare
C/charon/build_tarballs.jl
Outdated
platforms = expand_cxxstring_abis(platforms) | ||
platforms = expand_gfortran_versions(platforms) | ||
|
||
# Filter libgfortran3 - the corresponding GCC is too old to compiler some of |
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.
# Filter libgfortran3 - the corresponding GCC is too old to compiler some of | |
# Filter libgfortran3 - the corresponding GCC is too old to compile some of |
Should hopefull allow the windows build of #7383 to go through.
Should hopefull allow the windows build of #7383 to go through.
#include "Teuchos_ParameterList.hpp" | ||
#include "Teuchos_RCP.hpp" | ||
#include "Teuchos_ArrayRCP.hpp" | ||
+#ifndef M_PI |
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.
On Win32 you need to define _USE_MATH_DEFINES
before importing math.h
to make the constants visible: https://learn.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=msvc-170
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.
I tried that, but it didn't work. Is there a mingw difference? I can try again.
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.
Pretty sure it should work, because we use it in a few places: https://github.com/search?q=repo%3AJuliaPackaging%2FYggdrasil%20_USE_MATH_DEFINES
I'll merge and try out the resulting build. I'll probably come back later to clean up the build some more. |
…ing#7534) Should hopefull allow the windows build of JuliaPackaging#7383 to go through.
* New Recipe: charon v2.2.0 * charom WIP * Charon WIP * Expand platforms to match Trilinos * Move license install up * rm target-specific path * Platform support tweaks * Paper over missing M_PI on windows
This pull request contains a new build recipe I built using the BinaryBuilder.jl wizard:
@staticfloat please review and merge.