diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-08-16 20:16:43 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-08-16 20:16:43 +0000 |
| commit | 4ab18306829b42596b31568bf51cf6644941f60f (patch) | |
| tree | d7aec2fcfb75fcfb8534b849c1fe5ab461fc2e8c | |
| parent | b1bd85c40eb5d22253fcc09c441abb50308ecd40 (diff) | |
| download | upstream-4ab18306829b42596b31568bf51cf6644941f60f.tar.gz upstream-4ab18306829b42596b31568bf51cf6644941f60f.tar.bz2 upstream-4ab18306829b42596b31568bf51cf6644941f60f.zip | |
ubi-utils: fix build with gcc5
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46610
| -rw-r--r-- | package/utils/ubi-utils/patches/010-fix-rpmatch.patch | 2 | ||||
| -rw-r--r-- | package/utils/ubi-utils/patches/110-gcc5-fix.patch | 41 | ||||
| -rw-r--r-- | package/utils/ubi-utils/patches/130-lzma_jffs2.patch | 2 |
3 files changed, 43 insertions, 2 deletions
diff --git a/package/utils/ubi-utils/patches/010-fix-rpmatch.patch b/package/utils/ubi-utils/patches/010-fix-rpmatch.patch index 4a04676b49..9d0de7f521 100644 --- a/package/utils/ubi-utils/patches/010-fix-rpmatch.patch +++ b/package/utils/ubi-utils/patches/010-fix-rpmatch.patch @@ -1,6 +1,6 @@ --- a/include/common.h +++ b/include/common.h -@@ -122,10 +122,12 @@ +@@ -137,10 +137,12 @@ static inline bool prompt(const char *ms } if (strcmp("\n", line) != 0) { diff --git a/package/utils/ubi-utils/patches/110-gcc5-fix.patch b/package/utils/ubi-utils/patches/110-gcc5-fix.patch new file mode 100644 index 0000000000..d871d670d2 --- /dev/null +++ b/package/utils/ubi-utils/patches/110-gcc5-fix.patch @@ -0,0 +1,41 @@ +--- a/mkfs.ubifs/hashtable/hashtable_itr.c ++++ b/mkfs.ubifs/hashtable/hashtable_itr.c +@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h) + } + + /*****************************************************************************/ +-/* key - return the key of the (key,value) pair at the current position */ +-/* value - return the value of the (key,value) pair at the current position */ +- +-void * +-hashtable_iterator_key(struct hashtable_itr *i) +-{ return i->e->k; } +- +-void * +-hashtable_iterator_value(struct hashtable_itr *i) +-{ return i->e->v; } +- +-/*****************************************************************************/ + /* advance - advance the iterator to the next element + * returns zero if advanced to end of table */ + +--- a/mkfs.ubifs/hashtable/hashtable_itr.h ++++ b/mkfs.ubifs/hashtable/hashtable_itr.h +@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h); + /* hashtable_iterator_key + * - return the value of the (key,value) pair at the current position */ + +-extern inline void * ++static inline void * + hashtable_iterator_key(struct hashtable_itr *i) + { + return i->e->k; +@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_ + /*****************************************************************************/ + /* value - return the value of the (key,value) pair at the current position */ + +-extern inline void * ++static inline void * + hashtable_iterator_value(struct hashtable_itr *i) + { + return i->e->v; diff --git a/package/utils/ubi-utils/patches/130-lzma_jffs2.patch b/package/utils/ubi-utils/patches/130-lzma_jffs2.patch index c788f25d29..8c3794d769 100644 --- a/package/utils/ubi-utils/patches/130-lzma_jffs2.patch +++ b/package/utils/ubi-utils/patches/130-lzma_jffs2.patch @@ -9,7 +9,7 @@ ifeq ($(WITHOUT_XATTR), 1) CPPFLAGS += -DWITHOUT_XATTR -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ $(BUILDDIR)/include/version.h.tmp: # # Utils in top level # |