summaryrefslogtreecommitdiff
path: root/system/e2fsprogs/header-fix.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-08 00:43:54 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-08 00:43:54 +0000
commit9b6e27621bb9b11ca6f226a735802b68126b792a (patch)
tree7892909af717c411a41f479354a2e84afb60b356 /system/e2fsprogs/header-fix.patch
parentc641d5e1eaffccaf039c6b702e2d7f67d19cf556 (diff)
downloadpackages-9b6e27621bb9b11ca6f226a735802b68126b792a.tar.gz
packages-9b6e27621bb9b11ca6f226a735802b68126b792a.tar.bz2
packages-9b6e27621bb9b11ca6f226a735802b68126b792a.tar.xz
packages-9b6e27621bb9b11ca6f226a735802b68126b792a.zip
system/e2fsprogs: bump to 1.45.0, modernise
Diffstat (limited to 'system/e2fsprogs/header-fix.patch')
-rw-r--r--system/e2fsprogs/header-fix.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/system/e2fsprogs/header-fix.patch b/system/e2fsprogs/header-fix.patch
index cc78a39d0..e3f4fe3b5 100644
--- a/system/e2fsprogs/header-fix.patch
+++ b/system/e2fsprogs/header-fix.patch
@@ -127,16 +127,17 @@
#endif
--- e2fsprogs-1.44.4/debugfs/set_fields.c.old 2018-08-19 02:26:58.000000000 +0000
+++ e2fsprogs-1.44.4/debugfs/set_fields.c 2018-10-22 22:22:34.510000000 +0000
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,8 @@
static errcode_t parse_mmp_clear(struct field_set_info *info, char *field,
char *arg);
--#if __GNUC_PREREQ (4, 6)
-+#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
+-#if __GNUC_PREREQ (4, 6) || defined(__clang__)
++#if defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) \
++ || defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#endif
-@@ -291,7 +291,7 @@
+@@ -291,7 +292,7 @@
{ "checksum", &set_mmp.mmp_checksum, NULL, 4, parse_uint },
{ 0, 0, 0, 0 }
};