gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libroxml: bump version to 2.3.0 

Starting with version 2.3.0, libroxml is now using autotools.
With autotools, the -Werror flag was dropped
	-> no need for the patch libroxml-0001-werror.patch
With autotools, the availability of -Wno-*-unused is auto detected
	-> no need for the patch libroxml-0002-wno-unused-result.patch

Signed-off-by: Tristan Lelong <tristan.lelong@blunderer.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Tristan Lelong 2014-02-01 15:07:43 -08:00 committed by Peter Korsgaard
parent 1dc2e9a831
commit 267edbf9aa
3 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/libroxml/libroxml-0001-werror.patch
View File

@ -1,22 +0,0 @@
[PATCH] remove -Werror from CFLAGS
-Werror should only be used during development, not in released SW.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: a/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@
# options
override CPPFLAGS += -Iinc/
-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror -Iinc/ $(DEFINES)
+override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Iinc/ $(DEFINES)
override LDFLAGS +=
ifeq ("$(OS)", "Darwin")

21
package/libroxml/libroxml-0002-wno-unused-result.patch
View File

@ -1,21 +0,0 @@
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")

24
package/libroxml/libroxml.mk
View File

@ -4,26 +4,12 @@
#
################################################################################
LIBROXML_VERSION = 2.2.3
LIBROXML_VERSION = 2.3.0
LIBROXML_SITE = http://download.libroxml.net/pool/v2.x/
LIBROXML_INSTALL_STAGING = YES
LIBROXML_LICENSE = LGPLv2.1+ with static link exception
LIBROXML_LICENSE_FILES = License.txt
define LIBROXML_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) OPTIM= -C $(@D) V=1 all
endef
LIBROXML_CONF_OPT = --disable-silent-rules
define LIBROXML_INSTALL_STAGING_CMDS
$(MAKE) DESTDIR=$(STAGING_DIR)/usr/ -C $(@D) install
endef
define LIBROXML_INSTALL_TARGET_CMDS
$(MAKE) DESTDIR=$(TARGET_DIR)/usr/ -C $(@D) install
endef
define LIBROXML_DISABLE_DOXYGEN
$(SED) 's:) doxy:):' $(@D)/Makefile
endef
LIBROXML_POST_PATCH_HOOKS += LIBROXML_DISABLE_DOXYGEN
$(eval $(generic-package))
$(eval $(autotools-package))