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

Jump to bottom

Bug fix for mapl when environment variable BASEDIR is set #229

Merged
merged 6 commits into from
Feb 25, 2023
Merged

Bug fix for mapl when environment variable BASEDIR is set #229

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9ed0a4
Bug fix for duplicate rpath errors on macOS when creating build cache…
climbfuji Jan 18, 2023
022e369
Merge branch 'jcsda_emc_spack_stack' of https://github.com/NOAA-EMC/s…
climbfuji Feb 16, 2023
eabe9b6
Bug fix in mapl: unset environment variable BASEDIR
climbfuji Feb 16, 2023
e2b7e7f
Merge branch 'jcsda_emc_spack_stack' of https://github.com/NOAA-EMC/s…
climbfuji Feb 23, 2023
691469b
Update comment in var/spack/repos/builtin/packages/mapl/package.py
climbfuji Feb 23, 2023
ba727e8
Merge branch 'jcsda_emc_spack_stack' of https://github.com/NOAA-EMC/s…
climbfuji Feb 25, 2023
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
9 changes: 9 additions & 0 deletions var/spack/repos/builtin/packages/mapl/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,12 @@ def patch(self):
subprocess.check_output(nc_pc_cmd, encoding="utf8").strip()
filter_file("(target_link_libraries[^)]+PUBLIC )", \
r'\1 %s '%nc_flags, "pfio/CMakeLists.txt")

def setup_build_environment(self, env):
# esma_cmake, an internal dependency of mapl, is
# looking for the cmake argument -DBASEDIR, and
# if it doesn't find it, it's looking for an
# environment variable with the same name. This
# name is common and used all over the place,
# and if it is set it breaks the mapl build.
env.unset("BASEDIR")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. Sorry about this, @climbfuji. I added that code because users here didn't want to always pass in -DBASEDIR on the CMake line. I don't mind doing it, but users liked being able to do cmake -B build and all works.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a problem at all, just wondering if we could use a safer name going forward, for example GEOS_BASEDIR or something like that?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, if/when we go to Spack, we won't need it, so that's nice. Unfortunately, BASEDIR is pretty much embedded into the foundations of GEOS. Build system, run script, etc.