diff options
| author | Diego Magdaleno <38844659+DiegoMagdaleno@users.noreply.github.com> | 2020-04-06 19:23:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 19:23:05 -0500 |
| commit | 2542d80e10f01b6fd1f404efa6950b1706102854 (patch) | |
| tree | ee02aa74c1471a611e452f58327b41eeea0c90d9 /var | |
| parent | 6ad0ca27c278bbb1d28f956819ce29443ee27a60 (diff) | |
| download | spack-2542d80e10f01b6fd1f404efa6950b1706102854.tar.gz spack-2542d80e10f01b6fd1f404efa6950b1706102854.tar.bz2 spack-2542d80e10f01b6fd1f404efa6950b1706102854.tar.xz spack-2542d80e10f01b6fd1f404efa6950b1706102854.zip | |
Update nano and fix coreutils on Darwin (#15883)
* Fixed building coreutils on Darwin
* Bump nano version to 4.9
* Coreutils: Add program prefix g so we don't conflict with Apple utilities
* Fix intendation
* Make format more spack like
* Removed unnecesary changes
* Merge branch 'develop' of github.com:DiegoMagdaleno/spack into develop
Fix linking libgit2 on Darwin
* Revert "Merge pull request #3 from spack/develop"
This reverts commit 58dbbdb82bfa4aa689758971eb423ae2b9d2c293, reversing
changes made to dd7a413f4870fc2778f801c882a50cfade18fe97.
* Revert "Revert "Merge pull request #3 from spack/develop""
This reverts commit f956aa7b135c39ea0eb4ba6b9329714067098a7c.
* Revert "Merge branch 'develop' of github.com:DiegoMagdaleno/spack into develop"
This reverts commit 50321f798674ec30d5c62fe696b4f8bccef6ab3d.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/coreutils/package.py | 16 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/nano/package.py | 7 |
2 files changed, 20 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/coreutils/package.py b/var/spack/repos/builtin/packages/coreutils/package.py index 4aa938a434..5743bfdc57 100644 --- a/var/spack/repos/builtin/packages/coreutils/package.py +++ b/var/spack/repos/builtin/packages/coreutils/package.py @@ -12,8 +12,9 @@ class Coreutils(AutotoolsPackage, GNUMirrorPackage): the core utilities which are expected to exist on every operating system. """ - homepage = "http://www.gnu.org/software/coreutils/" - gnu_mirror_path = "coreutils/coreutils-8.26.tar.xz" + + homepage = 'http://www.gnu.org/software/coreutils/' + gnu_mirror_path = 'coreutils/coreutils-8.26.tar.xz' version('8.31', sha256='ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd') version('8.30', sha256='e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057') @@ -22,3 +23,14 @@ class Coreutils(AutotoolsPackage, GNUMirrorPackage): version('8.23', sha256='ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d') build_directory = 'spack-build' + + def configure_args(self): + spec = self.spec + configure_args = [] + if spec.satisfies('platform=darwin'): + configure_args.append('--program-prefix=g') + configure_args.append('--without-gmp') + configure_args.append('gl_cv_func_ftello_works=yes') + configure_args.append('FORCE_UNSAFE_CONFIGURE=1') + + return configure_args diff --git a/var/spack/repos/builtin/packages/nano/package.py b/var/spack/repos/builtin/packages/nano/package.py index 0901db0a05..9fce06f929 100644 --- a/var/spack/repos/builtin/packages/nano/package.py +++ b/var/spack/repos/builtin/packages/nano/package.py @@ -10,11 +10,16 @@ class Nano(AutotoolsPackage): """Tiny little text editor""" homepage = "http://www.nano-editor.org" - url = "https://www.nano-editor.org/dist/v4/nano-4.4.tar.xz" + url = "https://www.nano-editor.org/dist/v4/nano-4.9.tar.xz" list_url = "https://www.nano-editor.org/dist/" list_depth = 1 # 4.x + version('4.9', sha256='0e399729d105cb1a587b4140db5cf1b23215a0886a42b215efa98137164233a6') + version('4.8', sha256='c348f61c68ab1d573b308398212a09cd68c60fbee20f01a5bd4b50071a258e63') + version('4.7', sha256='58c0e197de5339ca3cad3ef42b65626d612ddb0b270e730f02e6ab3785c736f5') + version('4.6', sha256='9bac3a4153774fd921dd3eb291986d43985466b081165b5ac5262b37b79628e9') + version('4.5', sha256='ded5c38f5ecd9de2b624e0db8013a375c169d3fbbd49575967b868847df8f533') version('4.4', sha256='2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7') version('4.3', sha256='00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81') version('4.2', sha256='1143defce62e391b241252ffdb6e5c1ded56cfe26d46ee81b796abe0ccc45df9') |