diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-06-19 22:42:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-06-19 22:42:12 -0400 |
| commit | 9a6953d28a92339c8bd4c0520a67e8d6765aa281 (patch) | |
| tree | c89c930faa0bd93df8af3e9d8ef326e5079b2637 /gnu | |
| parent | cbfb893493a286703e7c5092de07449b39a194a4 (diff) | |
gnu: mdadm: Add compilation fix for gcc-4.9.
* gnu/packages/patches/mdadm-gcc-4.9-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (mdadm): Add patch.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/linux.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/mdadm-gcc-4.9-fix.patch | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1b220c4e32a..986a51a46a2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm | |||
| @@ -2137,7 +2137,8 @@ MPEG-2 and audio over Linux IEEE 1394.") | |||
| 2137 | version ".tar.xz")) | 2137 | version ".tar.xz")) |
| 2138 | (sha256 | 2138 | (sha256 |
| 2139 | (base32 | 2139 | (base32 |
| 2140 | "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")))) | 2140 | "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")) |
| 2141 | (patches (list (search-patch "mdadm-gcc-4.9-fix.patch"))))) | ||
| 2141 | (build-system gnu-build-system) | 2142 | (build-system gnu-build-system) |
| 2142 | (inputs | 2143 | (inputs |
| 2143 | `(("udev" ,eudev))) | 2144 | `(("udev" ,eudev))) |
diff --git a/gnu/packages/patches/mdadm-gcc-4.9-fix.patch b/gnu/packages/patches/mdadm-gcc-4.9-fix.patch new file mode 100644 index 00000000000..222fd0ea328 --- /dev/null +++ b/gnu/packages/patches/mdadm-gcc-4.9-fix.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From 68641cdb646eaa15099c1d6cfff1eaa5dd2ac841 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jes Sorensen <Jes.Sorensen@redhat.com> | ||
| 3 | Date: Tue, 24 Feb 2015 16:00:40 -0500 | ||
| 4 | Subject: [PATCH] write_super_imsm_spares(): C statements are terminated by ; | ||
| 5 | |||
| 6 | Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> | ||
| 7 | Signed-off-by: NeilBrown <neilb@suse.de> | ||
| 8 | --- | ||
| 9 | super-intel.c | 12 ++++++------ | ||
| 10 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/super-intel.c b/super-intel.c | ||
| 13 | index 819e0da..7f75b53 100644 | ||
| 14 | --- a/super-intel.c | ||
| 15 | +++ b/super-intel.c | ||
| 16 | @@ -5115,13 +5115,13 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose) | ||
| 17 | __u32 sum; | ||
| 18 | struct dl *d; | ||
| 19 | |||
| 20 | - spare->mpb_size = __cpu_to_le32(sizeof(struct imsm_super)), | ||
| 21 | - spare->generation_num = __cpu_to_le32(1UL), | ||
| 22 | + spare->mpb_size = __cpu_to_le32(sizeof(struct imsm_super)); | ||
| 23 | + spare->generation_num = __cpu_to_le32(1UL); | ||
| 24 | spare->attributes = MPB_ATTRIB_CHECKSUM_VERIFY; | ||
| 25 | - spare->num_disks = 1, | ||
| 26 | - spare->num_raid_devs = 0, | ||
| 27 | - spare->cache_size = mpb->cache_size, | ||
| 28 | - spare->pwr_cycle_count = __cpu_to_le32(1), | ||
| 29 | + spare->num_disks = 1; | ||
| 30 | + spare->num_raid_devs = 0; | ||
| 31 | + spare->cache_size = mpb->cache_size; | ||
| 32 | + spare->pwr_cycle_count = __cpu_to_le32(1); | ||
| 33 | |||
| 34 | snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, | ||
| 35 | MPB_SIGNATURE MPB_VERSION_RAID0); | ||
| 36 | -- | ||
| 37 | 2.4.3 | ||
| 38 | |||
