summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Dawson <spdawson@gmail.com>2013-11-21 17:19:40 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-11-22 11:19:57 (GMT)
commit2b2c6579575bc87bf3e6f0d9a5ba1f50561fa101 (patch)
treecc5879b0e9e1ec6d339acd5436a7e5f3c9a6d766
parent2b468f1bd94d824ee32d4351d548955ae1e05435 (diff)
downloadbuildroot-2b2c6579575bc87bf3e6f0d9a5ba1f50561fa101.tar.gz
buildroot-2b2c6579575bc87bf3e6f0d9a5ba1f50561fa101.tar.bz2
libroxml: fix avr32 build failure
The -Wno-unused-result option is not understood by the version of gcc used by the avr32 toolchain. Remove the option from the compilation flags. Fixes build failures such as the following. http://autobuild.buildroot.net/results/e22/e22d94fca3eabb4e54d82af04319f17ad8e10c20/ The single existing patch for libroxml has been renamed to include a numerical component for application order sorting. The existing patch has also been updated to apply without fuzz. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libroxml/libroxml-0001-werror.patch (renamed from package/libroxml/libroxml-werror.patch)2
-rw-r--r--package/libroxml/libroxml-0002-wno-unused-result.patch21
2 files changed, 22 insertions, 1 deletions
diff --git a/package/libroxml/libroxml-werror.patch b/package/libroxml/libroxml-0001-werror.patch
index 6435b01..91f322c 100644
--- a/package/libroxml/libroxml-werror.patch
+++ b/package/libroxml/libroxml-0001-werror.patch
@@ -11,7 +11,7 @@ Index: a/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
-@@ -41,7 +41,7 @@
+@@ -46,7 +46,7 @@
# options
override CPPFLAGS += -Iinc/
diff --git a/package/libroxml/libroxml-0002-wno-unused-result.patch b/package/libroxml/libroxml-0002-wno-unused-result.patch
new file mode 100644
index 0000000..406bf3c
--- /dev/null
+++ b/package/libroxml/libroxml-0002-wno-unused-result.patch
@@ -0,0 +1,21 @@
+The -Wno-unused-result option is not understood by the version of gcc used by the
+avr32 toolchain. Remove the option from the compilation flags.
+
+Fixes build failures such as the following.
+
+ http://autobuild.buildroot.net/results/e22/e22d94fca3eabb4e54d82af04319f17ad8e10c20/
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+diff -Nurp a/Makefile b/Makefile
+--- a/Makefile 2013-11-21 17:13:17.679388374 +0000
++++ b/Makefile 2013-11-21 17:13:35.219299157 +0000
+@@ -46,7 +46,7 @@ DEFINES = -DIGNORE_EMPTY_TEXT_NODES
+
+ # options
+ override CPPFLAGS += -Iinc/
+-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Iinc/ $(DEFINES)
++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Iinc/ $(DEFINES)
+ override LDFLAGS +=
+
+ ifeq ("$(OS)", "Darwin")