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 | |
| parent | cbfb893493a286703e7c5092de07449b39a194a4 (diff) | |
| download | patches-9a6953d28a92339c8bd4c0520a67e8d6765aa281.tar patches-9a6953d28a92339c8bd4c0520a67e8d6765aa281.tar.gz | |
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.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/mdadm-gcc-4.9-fix.patch | 38 |
3 files changed, 41 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index b43d541b05..82a8677d63 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -508,6 +508,7 @@ dist_patch_DATA = \ gnu/packages/patches/maxima-defsystem-mkdir.patch \ gnu/packages/patches/mc-fix-ncurses-build.patch \ gnu/packages/patches/mcron-install.patch \ + gnu/packages/patches/mdadm-gcc-4.9-fix.patch \ gnu/packages/patches/mhash-keygen-test-segfault.patch \ gnu/packages/patches/mit-krb5-init-fix.patch \ gnu/packages/patches/mpc123-initialize-ao.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1b220c4e32..986a51a46a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2137,7 +2137,8 @@ MPEG-2 and audio over Linux IEEE 1394.") version ".tar.xz")) (sha256 (base32 - "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")))) + "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")) + (patches (list (search-patch "mdadm-gcc-4.9-fix.patch"))))) (build-system gnu-build-system) (inputs `(("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 0000000000..222fd0ea32 --- /dev/null +++ b/gnu/packages/patches/mdadm-gcc-4.9-fix.patch @@ -0,0 +1,38 @@ +From 68641cdb646eaa15099c1d6cfff1eaa5dd2ac841 Mon Sep 17 00:00:00 2001 +From: Jes Sorensen <Jes.Sorensen@redhat.com> +Date: Tue, 24 Feb 2015 16:00:40 -0500 +Subject: [PATCH] write_super_imsm_spares(): C statements are terminated by ; + +Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> +Signed-off-by: NeilBrown <neilb@suse.de> +--- + super-intel.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/super-intel.c b/super-intel.c +index 819e0da..7f75b53 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -5115,13 +5115,13 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose) + __u32 sum; + struct dl *d; + +- spare->mpb_size = __cpu_to_le32(sizeof(struct imsm_super)), +- spare->generation_num = __cpu_to_le32(1UL), ++ spare->mpb_size = __cpu_to_le32(sizeof(struct imsm_super)); ++ spare->generation_num = __cpu_to_le32(1UL); + spare->attributes = MPB_ATTRIB_CHECKSUM_VERIFY; +- spare->num_disks = 1, +- spare->num_raid_devs = 0, +- spare->cache_size = mpb->cache_size, +- spare->pwr_cycle_count = __cpu_to_le32(1), ++ spare->num_disks = 1; ++ spare->num_raid_devs = 0; ++ spare->cache_size = mpb->cache_size; ++ spare->pwr_cycle_count = __cpu_to_le32(1); + + snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, + MPB_SIGNATURE MPB_VERSION_RAID0); +-- +2.4.3 + |