diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-05-02 16:31:17 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 17:59:05 +0100 |
| commit | 58da3355522736b93bb6d164739c795068d2a1e8 (patch) | |
| tree | 6b7421531aa7e2976672357f7360d2b70e3b72b7 /meta/recipes-extended/mdadm | |
| parent | 5b5016ed87bcc916d29fb7e1e3d23a600847c882 (diff) | |
| download | openembedded-core-58da3355522736b93bb6d164739c795068d2a1e8.tar.gz openembedded-core-58da3355522736b93bb6d164739c795068d2a1e8.tar.bz2 openembedded-core-58da3355522736b93bb6d164739c795068d2a1e8.zip | |
mdadm: Fix build on gcc 4.9
Fix
error: right-hand operand of comma expression has no effect
[-Werror=unused-value]
(From OE-Core rev: 9e1aac485175d29951f7ad23cd7515c8f7580271)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm')
| -rw-r--r-- | meta/recipes-extended/mdadm/files/gcc-4.9.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-extended/mdadm/mdadm_3.3.bb | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/meta/recipes-extended/mdadm/files/gcc-4.9.patch new file mode 100644 index 0000000000..54bf1d79ab --- /dev/null +++ b/meta/recipes-extended/mdadm/files/gcc-4.9.patch @@ -0,0 +1,22 @@ +super-intel.c:5063:2: error: right-hand operand of comma expression has no effect [-Werror=unused-value] + snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, + ^ +cc1: all warnings being treated as errors +make: *** [super-intel.o] Error 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: mdadm-3.3/super-intel.c +=================================================================== +--- mdadm-3.3.orig/super-intel.c 2014-05-02 15:08:21.154319651 -0700 ++++ mdadm-3.3/super-intel.c 2014-05-02 15:09:31.470985794 -0700 +@@ -5060,7 +5060,7 @@ + spare->cache_size = mpb->cache_size, + spare->pwr_cycle_count = __cpu_to_le32(1), + +- snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, ++ (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH, + MPB_SIGNATURE MPB_VERSION_RAID0); + + for (d = super->disks; d; d = d->next) { diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.bb b/meta/recipes-extended/mdadm/mdadm_3.3.bb index 5ef418e170..40d68d6664 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.3.bb @@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ - file://mdadm-3.2.2_fix_for_x32.patch \ + file://mdadm-3.2.2_fix_for_x32.patch \ + file://gcc-4.9.patch \ " SRC_URI[md5sum] = "8ac04259cdd74b4566c3b6dea9414b57" |