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.

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

Add Mac fixes to hashstack's proteus configuration. #991

Open
wants to merge 10 commits into
base: stable/proteus
Choose a base branch
from

Conversation

tjcorona
Copy link

No description provided.

Copy link
Contributor

@cekees cekees left a comment

Choose a reason for hiding this comment

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

I had a few questions above, but I think we can get this merged in soon and get the stack commit updated on proteus master.

handler: bash
bash: |
patch -up1 < _hashdist/libiconv_plug.patch
#build_stages:
Copy link
Contributor

Choose a reason for hiding this comment

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

you can just delete this commented code if it's not necessary any more

@@ -14,6 +14,7 @@ build_stages:
before: install
handler: bash
bash: |
export HDF5_VERSION='1.8.16'
export HDF5_VERSION='1.8.13'
Copy link
Contributor

Choose a reason for hiding this comment

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

What necessitated going backward on the release?

Copy link
Author

Choose a reason for hiding this comment

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

This change was made by @mfarthin.

- url: https://github.com/SCOREC/core.git
key: git:e219777edd875d35096dfedd7197300b8e2f3837

- url: https://github.com/tjcorona/core.git
Copy link
Contributor

Choose a reason for hiding this comment

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

Have your changes to scorec core not been merged in? Maybe we should put and if statement here to do this conditionally only for darwin or do it as a patch instead. Maybe @zhanga can look into the changes on scorec core.

Copy link
Author

Choose a reason for hiding this comment

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

I think the version we were using had the error, and the newest version of SCOREC/core wasn't compatible with other things. The easiest fix was to branch and patch the version we were using.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants