Skip to content

Update nano and fix coreutils on Darwin#15883

Merged
adamjstewart merged 15 commits intospack:developfrom
DiegoMagdaleno:develop
Apr 7, 2020
Merged

Update nano and fix coreutils on Darwin#15883
adamjstewart merged 15 commits intospack:developfrom
DiegoMagdaleno:develop

Conversation

@DiegoMagdaleno
Copy link
Copy Markdown
Contributor

Coreutils:

  • Fixes an error making it not being able to build if you are root user
  • Fixed errors building on Darwin, reference
  • Add the program prefix "g" so we don't conflict with Apple's "coreutils" that are BSD versions

Nano:

  • Updated nano version up to 4.9, but also included previous versions

@DiegoMagdaleno
Copy link
Copy Markdown
Contributor Author

I don't know why the test for the documentation failed, if I didn't modify any of those :/

@adamjstewart
Copy link
Copy Markdown
Member

I don't know why the test for the documentation failed, if I didn't modify any of those :/

This morning Sphinx released 3.0.0, which added a lot of fancy features like automatic type checking. Unfortunately/fortunately, these new features uncovered a bug in our Executable class. This has been fixed in develop, so if you rebase your PR on the tip of develop, it should pass the doc tests.

spec = self.spec
configure_args = []
if spec.satisfies('platform=darwin'):
configure_args.append('--program-prefix=g')
Copy link
Copy Markdown
Member

@adamjstewart adamjstewart Apr 5, 2020

Choose a reason for hiding this comment

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

I think I'm okay with this decision, but let's wait and hear from other users.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ok I'll bite. I use this without the prefix all the time. I think this should be an option, like +prefix. Homebrew ships coreutils with libexec/gnubin containing the non-prefixed binaries, so you can actually add it to your path.

Was there an issue with using this without the prefix? I've been using it that way on my mac for a while.

@DiegoMagdaleno
Copy link
Copy Markdown
Contributor Author

Unnecessary changes are removed :)

@adamjstewart adamjstewart requested a review from scheibelp April 5, 2020 22:31
self.spec['libssh2'].prefix.lib
+ '/libssh2.1.0.1.dylib'),
'{0}'.format(
prefix.lib + '/libgit2.1.0.0.dylib'))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does this work?

    @run_after('install')                                                       
    def darwin_fix(self):                                                       
        # The shared library is not installed correctly on Darwin; fix this     
        if self.spec.satisfies('platform=darwin'):                              
            fix_darwin_install_name(self.prefix.lib)       

We have a builtin function to do this.

@adamjstewart
Copy link
Copy Markdown
Member

It seems like these changes are unrelated. It's best to open a separate PR for each package change, as it makes it easier to review.

@DiegoMagdaleno
Copy link
Copy Markdown
Contributor Author

Oh yeah my bad, didn’t realise I committed this changes to the develop branch on my fork, I work on my own branch for that changes, will revert, my bad.

@DiegoMagdaleno
Copy link
Copy Markdown
Contributor Author

Just reverted, sorry will work on my own branch from now on, forgot to do it, the only changes here are Nano and the coreutils, however, I will do a pull request for each package I fix or add, again sorry, and yeah I try the method you suggested in the code review for fixing libgit.

@adamjstewart adamjstewart merged commit 2542d80 into spack:develop Apr 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants