diff options
Diffstat (limited to 'var')
3 files changed, 235 insertions, 23 deletions
diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 9451ff4f3c..45a0b00651 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -12,10 +12,11 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/bash/" gnu_mirror_path = "bash/bash-5.0.tar.gz" - version('5.0', sha256='b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d') - version('4.4.12', sha256='57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331') - version('4.4', sha256='d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb') - version('4.3', sha256='afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4') + maintainers = ['adamjstewart'] + + version('5.0', sha256='b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d') + version('4.4', sha256='d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb') + version('4.3', sha256='afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4') depends_on('ncurses') depends_on('readline@5.0:') @@ -40,6 +41,79 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): ('5.0', '016', 'ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d'), ('5.0', '017', '4cf3b9fafb8a66d411dd5fc9120032533a4012df1dc6ee024c7833373e2ddc31'), ('5.0', '018', '7c314e375a105a6642e8ed44f3808b9def89d15f7492fe2029a21ba9c0de81d3'), + + ('4.4', '001', '3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f'), + ('4.4', '002', '7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53'), + ('4.4', '003', '51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2'), + ('4.4', '004', 'ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3'), + ('4.4', '005', '221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529'), + ('4.4', '006', '6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8'), + ('4.4', '007', 'de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf'), + ('4.4', '008', '86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba'), + ('4.4', '009', '0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c'), + ('4.4', '010', '8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06'), + ('4.4', '011', 'dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d'), + ('4.4', '012', 'fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e'), + ('4.4', '013', '1b25efacbc1c4683b886d065b7a089a3601964555bcbf11f3a58989d38e853b6'), + ('4.4', '014', 'a7f75cedb43c5845ab1c60afade22dcb5e5dc12dd98c0f5a3abcfb9f309bb17c'), + ('4.4', '015', 'd37602ecbeb62d5a22c8167ea1e621fcdbaaa79925890a973a45c810dd01c326'), + ('4.4', '016', '501f91cc89fadced16c73aa8858796651473602c722bb29f86a8ba588d0ff1b1'), + ('4.4', '017', '773f90b98768d4662a22470ea8eec5fdd8e3439f370f94638872aaf884bcd270'), + ('4.4', '018', '5bc494b42f719a8b0d844b7bd9ad50ebaae560e97f67c833c9e7e9d53981a8cc'), + ('4.4', '019', '27170d6edfe8819835407fdc08b401d2e161b1400fe9d0c5317a51104c89c11e'), + ('4.4', '020', '1840e2cbf26ba822913662f74037594ed562361485390c52813b38156c99522c'), + ('4.4', '021', 'bd8f59054a763ec1c64179ad5cb607f558708a317c2bdb22b814e3da456374c1'), + ('4.4', '022', '45331f0936e36ab91bfe44b936e33ed8a1b1848fa896e8a1d0f2ef74f297cb79'), + ('4.4', '023', '4fec236f3fbd3d0c47b893fdfa9122142a474f6ef66c20ffb6c0f4864dd591b6'), + + ('4.3', '001', 'ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742'), + ('4.3', '002', 'eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b'), + ('4.3', '003', '000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d'), + ('4.3', '004', '5ea0a42c6506720d26e6d3c5c358e9a0d49f6f189d69a8ed34d5935964821338'), + ('4.3', '005', '1ac83044032b9f5f11aeca8a344ae3c524ec2156185d3adbb8ad3e7a165aa3fa'), + ('4.3', '006', 'a0648ee72d15e4a90c8b77a5c6b19f8d89e28c1bc881657d22fe26825f040213'), + ('4.3', '007', '1113e321c59cf6a8648a36245bbe4217cf8acf948d71e67886dad7d486f8f3a3'), + ('4.3', '008', '9941a98a4987192cc5ce3d45afe879983cad2f0bec96d441a4edd9033767f95e'), + ('4.3', '009', 'c0226d6728946b2f53cdebf090bcd1c01627f01fee03295768605caa80bb40a5'), + ('4.3', '010', 'ce05799c0137314c70c7b6ea0477c90e1ac1d52e113344be8e32fa5a55c9f0b7'), + ('4.3', '011', '7c63402cdbc004a210f6c1c527b63b13d8bb9ec9c5a43d5c464a9010ff6f7f3b'), + ('4.3', '012', '3e1379030b35fbcf314e9e7954538cf4b43be1507142b29efae39eef997b8c12'), + ('4.3', '013', 'bfa8ca5336ab1f5ef988434a4bdedf71604aa8a3659636afa2ce7c7446c42c79'), + ('4.3', '014', '5a4d6fa2365b6eb725a9d4966248b5edf7630a4aeb3fa8d526b877972658ac13'), + ('4.3', '015', '13293e8a24e003a44d7fe928c6b1e07b444511bed2d9406407e006df28355e8d'), + ('4.3', '016', '92d60bcf49f61bd7f1ccb9602bead6f2c9946d79dea0e5ec0589bb3bfa5e0773'), + ('4.3', '017', '1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c3b8a23e7780'), + ('4.3', '018', '7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58'), + ('4.3', '019', 'a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23'), + ('4.3', '020', 'ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98'), + ('4.3', '021', '41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9'), + ('4.3', '022', 'fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88'), + ('4.3', '023', '9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4'), + ('4.3', '024', '3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c'), + ('4.3', '025', '1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251'), + ('4.3', '026', '2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d'), + ('4.3', '027', '1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe'), + ('4.3', '028', 'e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d'), + ('4.3', '029', '4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292'), + ('4.3', '030', '85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b'), + ('4.3', '031', 'cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d'), + ('4.3', '032', '889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a'), + ('4.3', '033', 'fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16'), + ('4.3', '034', 'f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889'), + ('4.3', '035', '370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3'), + ('4.3', '036', 'ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c'), + ('4.3', '037', '33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813'), + ('4.3', '038', 'adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367'), + ('4.3', '039', 'ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec'), + ('4.3', '040', '84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b'), + ('4.3', '041', '4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a'), + ('4.3', '042', 'ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919'), + ('4.3', '043', '47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180'), + ('4.3', '044', '9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99'), + ('4.3', '045', 'ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023'), + ('4.3', '046', 'b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f'), + ('4.3', '047', 'c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a'), + ('4.3', '048', '5b8215451c5d096ca1e115307ffe6613553551a70369525a0778f216c3a4dfa2'), ] # TODO: patches below are not managed by the GNUMirrorPackage base class @@ -48,7 +122,9 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): patch('https://ftpmirror.gnu.org/bash/bash-{0}-patches/bash{1}-{2}'.format(ver, ver.joined, num), level=0, when='@{0}'.format(ver), sha256=checksum) - patch('xcode12-strsignal-conf.patch', when='@:5.0 %apple-clang@12:') + # Modified from: + # https://github.com/macports/macports-ports/blob/master/shells/bash/files/patch-configure.diff + patch('patch-configure.diff', when='@:5.0 %apple-clang@12:') executables = ['^bash$'] diff --git a/var/spack/repos/builtin/packages/bash/patch-configure.diff b/var/spack/repos/builtin/packages/bash/patch-configure.diff new file mode 100644 index 0000000000..a5ffea6e19 --- /dev/null +++ b/var/spack/repos/builtin/packages/bash/patch-configure.diff @@ -0,0 +1,154 @@ +--- a/configure 2019-01-02 08:43:31.000000000 -0600 ++++ b/configure 2020-11-07 12:17:15.000000000 -0600 +@@ -5336,6 +5336,7 @@ + /* end confdefs.h. */ + + #include <stdio.h> ++#include <stdlib.h> + #include <readline/readline.h> + + extern int rl_gnu_readline_p; +@@ -12902,6 +12903,7 @@ + #endif + #include <stdio.h> + #include <ctype.h> ++#include <stdlib.h> + + main(c, v) + int c; +@@ -12961,6 +12963,7 @@ + + #include <sys/types.h> + #include <fcntl.h> ++#include <stdlib.h> + main() + { + int fd1, fd2, fl; +@@ -13012,6 +13015,7 @@ + #ifdef HAVE_UNISTD_H + # include <unistd.h> + #endif ++#include <stdlib.h> + main() + { + # ifdef GETPGRP_VOID +@@ -13225,6 +13229,7 @@ + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif ++#include <stdlib.h> + #if !HAVE_DECL_SYS_SIGLIST + extern char *sys_siglist[]; + #endif +@@ -13309,6 +13314,7 @@ + #ifndef UNDER_SYS_SIGLIST_DECLARED + extern char *_sys_siglist[]; + #endif ++#include <stdlib.h> + main() + { + char *msg = (char *)_sys_siglist[2]; +@@ -14626,6 +14632,7 @@ + # include <ndir.h> + # endif + #endif /* HAVE_DIRENT_H */ ++#include <stdlib.h> + main() + { + DIR *dir; +@@ -14677,6 +14684,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <stdlib.h> + main() + { + long maxfds = ulimit(4, 0L); +@@ -14754,6 +14762,7 @@ + { + return "42"; + } ++#include <stdlib.h> + main() + { + char *s; +@@ -14805,7 +14814,7 @@ + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif +- ++#include <stdlib.h> + main() + { + char *xpwd; +@@ -14860,7 +14869,7 @@ + #include <sys/types.h> + #include <signal.h> + #include <setjmp.h> +- ++#include <stdlib.h> + main() + { + #if !defined (_POSIX_VERSION) || !defined (HAVE_POSIX_SIGNALS) +@@ -14929,7 +14938,8 @@ + #if defined (HAVE_LOCALE_H) + #include <locale.h> + #endif +- ++#include <stdlib.h> ++#include <string.h> + main(c, v) + int c; + char *v[]; +@@ -14999,7 +15009,7 @@ + /* end confdefs.h. */ + + #include <stdio.h> +- ++#include <stdlib.h> + main() + { + int n; +@@ -15237,6 +15247,7 @@ + /* end confdefs.h. */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + + int +@@ -15380,6 +15391,7 @@ + nsigint++; + } + ++#include <stdlib.h> + main() + { + nsigint = 0; +@@ -15501,7 +15513,7 @@ + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif +- ++#include <stdlib.h> + /* Add more tests in here as appropriate. */ + main() + { +@@ -15697,7 +15709,7 @@ + #include <sys/wait.h> + #include <unistd.h> + #include <errno.h> +- ++#include <stdlib.h> + #ifndef errno + extern int errno; + #endif +@@ -15811,7 +15823,7 @@ + + #include <sys/types.h> + #include <signal.h> +- ++#include <stdlib.h> + #ifndef NSIG + # define NSIG 64 + #endif diff --git a/var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch b/var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch deleted file mode 100644 index 4f5f5abfa0..0000000000 --- a/var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/configure 2019-01-02 08:43:31.000000000 -0600 -+++ b/configure 2020-09-21 10:40:42.000000000 -0500 -@@ -14568,6 +14568,7 @@ - /* end confdefs.h. */ - #include <sys/types.h> - #include <signal.h> -+#include <string.h> - int - main () - { -@@ -14999,6 +15000,7 @@ - /* end confdefs.h. */ - - #include <stdio.h> -+#include <stdlib.h> - - main() - { |