diff options
| author | noguchi-k <55966120+noguchi-k@users.noreply.github.com> | 2020-01-30 04:45:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 11:45:37 -0800 |
| commit | da189b8d1d0b9bb920b4af2de4016fe4db043425 (patch) | |
| tree | 246767778062f1bf89bc2de84eb45472f5168fe6 | |
| parent | ed4d544e8fac7b5faa5918d4ed0d9ee9adc7d95e (diff) | |
| download | spack-da189b8d1d0b9bb920b4af2de4016fe4db043425.tar.gz spack-da189b8d1d0b9bb920b4af2de4016fe4db043425.tar.bz2 spack-da189b8d1d0b9bb920b4af2de4016fe4db043425.tar.xz spack-da189b8d1d0b9bb920b4af2de4016fe4db043425.zip | |
Fastx-toolkit package: patch for Fujitsu compiler (#14218)
Specify the scope of pragma pack
| -rw-r--r-- | var/spack/repos/builtin/packages/fastx-toolkit/fix_pragma_pack.patch | 19 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/fastx-toolkit/package.py | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/fastx-toolkit/fix_pragma_pack.patch b/var/spack/repos/builtin/packages/fastx-toolkit/fix_pragma_pack.patch new file mode 100644 index 0000000000..5f4d178d03 --- /dev/null +++ b/var/spack/repos/builtin/packages/fastx-toolkit/fix_pragma_pack.patch @@ -0,0 +1,19 @@ +--- spack-src/src/libfastx/fastx.h.org 2019-12-19 12:05:37.497936486 +0900 ++++ spack-src/src/libfastx/fastx.h 2019-12-19 13:44:55.481837853 +0900 +@@ -58,7 +58,7 @@ + OUTPUT_SAME_AS_INPUT=3 + } OUTPUT_FILE_TYPE; + +-#pragma pack(1) ++#pragma pack(push, 1) + typedef struct + { + /* Record data - common for FASTA/FASTQ */ +@@ -115,6 +115,7 @@ + FILE* input; + FILE* output; + } FASTX ; ++#pragma pack(pop) + + + void fastx_init_reader(FASTX *pFASTX, const char* filename, diff --git a/var/spack/repos/builtin/packages/fastx-toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py index 48633acbc6..8ad93ddad5 100644 --- a/var/spack/repos/builtin/packages/fastx-toolkit/package.py +++ b/var/spack/repos/builtin/packages/fastx-toolkit/package.py @@ -19,3 +19,5 @@ class FastxToolkit(AutotoolsPackage): # patch implicit fallthrough patch("pr-22.patch") + # fix error [-Werror,-Wpragma-pack] + patch('fix_pragma_pack.patch', when='%fj') |