libroxml: bump version to 2.3.0
PATCH 1/1 libroxml: bump version to 2.3.0
From: Tristan Lelong <[email protected]>
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
--- package/libroxml/libroxml-0001-werror.patch | 22 -------------------- .../libroxml/libroxml-0002-wno-unused-result.patch | 21 ------------------- package/libroxml/libroxml.mk | 24 +++++----------------- 3 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 package/libroxml/libroxml-0001-werror.patch delete mode 100644 package/libroxml/libroxml-0002-wno-unused-result.patch
package/libroxml/libroxml-0001-werror.patch deleted +0 -22
@@ -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 <[email protected]> ---- - 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")
package/libroxml/libroxml-0002-wno-unused-result.patch deleted +0 -21
@@ -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 <[email protected]> - -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")
package/libroxml/libroxml.mk +5 -19
@@ -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+ +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))
Signature · 1 line
618FE3EF
PATCH 1/1 libroxml: bump version to 2.3.0
Hello,
package/libroxml/libroxml.mk line 10
Quoted 5 lines · blunderer at blunderer.org
package/libroxml/libroxml.mk +2
-1-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+
Maybe we want to indicate the static linking exception, something like:
LIBROXML_LICENSE = LGPLv2.1+ with static link exception
Maybe you also want to disable the build of the documentation and the tests? I see that there are configuration options available for these in your configure.ac.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 libroxml: bump version to 2.3.0
I will add this linking exception.
Regarding Documentation and tests, this is disabled by default, so we shouldn't need anymore configuration option.
I'll resend the corrected patch.
Thanks
2014-02-01 Thomas Petazzoni <[email protected]>:
Quoted 26 lines
Hello,
package/libroxml/libroxml.mk line 10
Quoted 5 lines · blunderer at blunderer.org
package/libroxml/libroxml.mk +2
-1-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+Maybe we want to indicate the static linking exception, something like:
LIBROXML_LICENSE= LGPLv2.1+ with static link exceptionMaybe you also want to disable the build of the documentation and the tests? I see that there are configuration options available for these in your configure.ac.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Signature · 4 lines
618FE3EF -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140201/343f21d8/attachment.html>
PATCH 1/1 libroxml: bump version to 2.3.0
Dear Tristan Lelong,
Quoted 4 lines · Tristan Lelong
I will add this linking exception.
Regarding Documentation and tests, this is disabled by default, so we shouldn't need anymore configuration option.
Ok.
Quoted 1 line
I'll resend the corrected patch.
Peter has merged your patch, and he has added the static link exception indication to the license info. So you don't need to send a corrected patch.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 libroxml: bump version to 2.3.0
In reply to blunderer at blunderer.orgFrom: Tristan Lelong <[email protected]>
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
--- package/libroxml/libroxml-0001-werror.patch | 22 -------------------- .../libroxml/libroxml-0002-wno-unused-result.patch | 21 ------------------- package/libroxml/libroxml.mk | 24 +++++----------------- 3 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 package/libroxml/libroxml-0001-werror.patch delete mode 100644 package/libroxml/libroxml-0002-wno-unused-result.patch
package/libroxml/libroxml-0001-werror.patch deleted +0 -22
@@ -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 <[email protected]> ---- - 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")
package/libroxml/libroxml-0002-wno-unused-result.patch deleted +0 -21
@@ -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 <[email protected]> - -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")
package/libroxml/libroxml.mk +5 -19
@@ -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))
Signature · 1 line
618FE3EF
PATCH v2 1/1 libroxml: bump version to 2.3.0
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"blunderer" == blunderer <[email protected]> writes:
From: Tristan Lelong <[email protected]> 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
Quoted 1 line
With autotools, the availability of -Wno-*-unused is auto detected
-> no need for the patch libroxml-0002-wno-unused-result.patch
Quoted 1 line
Signed-off-by Tristan Lelong <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard