* [Buildroot] [PATCH] libroxml: bump version to 2.3.0
@ 2014-01-31 17:36 blunderer at blunderer.org
2014-02-01 8:45 ` Thomas Petazzoni
2014-02-01 23:07 ` [Buildroot] [PATCH v2] " blunderer at blunderer.org
0 siblings, 2 replies; 6+ messages in thread
From: blunderer at blunderer.org @ 2014-01-31 17:36 UTC (permalink / raw)
To: buildroot
From: Tristan Lelong <tristan.lelong@blunderer.org>
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 <tristann.lelong@blunderer.org>
---
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
diff --git a/package/libroxml/libroxml-0001-werror.patch b/package/libroxml/libroxml-0001-werror.patch
deleted file mode 100644
index 91f322c..0000000
--- a/package/libroxml/libroxml-0001-werror.patch
+++ /dev/null
@@ -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")
diff --git a/package/libroxml/libroxml-0002-wno-unused-result.patch b/package/libroxml/libroxml-0002-wno-unused-result.patch
deleted file mode 100644
index 406bf3c..0000000
--- a/package/libroxml/libroxml-0002-wno-unused-result.patch
+++ /dev/null
@@ -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")
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index ca32bf9..fac94b5 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -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))
--
618FE3EF
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libroxml: bump version to 2.3.0
2014-01-31 17:36 [Buildroot] [PATCH] libroxml: bump version to 2.3.0 blunderer at blunderer.org
@ 2014-02-01 8:45 ` Thomas Petazzoni
2014-02-01 22:30 ` Tristan Lelong
2014-02-01 23:07 ` [Buildroot] [PATCH v2] " blunderer at blunderer.org
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2014-02-01 8:45 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 31 Jan 2014 09:36:42 -0800, blunderer at blunderer.org wrote:
> -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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libroxml: bump version to 2.3.0
2014-02-01 8:45 ` Thomas Petazzoni
@ 2014-02-01 22:30 ` Tristan Lelong
2014-02-02 10:05 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Tristan Lelong @ 2014-02-01 22:30 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>:
> Hello,
>
> On Fri, 31 Jan 2014 09:36:42 -0800, blunderer at blunderer.org wrote:
>
> > -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
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>
--
618FE3EF
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140201/343f21d8/attachment.html>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] libroxml: bump version to 2.3.0
2014-01-31 17:36 [Buildroot] [PATCH] libroxml: bump version to 2.3.0 blunderer at blunderer.org
2014-02-01 8:45 ` Thomas Petazzoni
@ 2014-02-01 23:07 ` blunderer at blunderer.org
2014-02-02 6:51 ` Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: blunderer at blunderer.org @ 2014-02-01 23:07 UTC (permalink / raw)
To: buildroot
From: Tristan Lelong <tristan.lelong@blunderer.org>
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>
---
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
diff --git a/package/libroxml/libroxml-0001-werror.patch b/package/libroxml/libroxml-0001-werror.patch
deleted file mode 100644
index 91f322c..0000000
--- a/package/libroxml/libroxml-0001-werror.patch
+++ /dev/null
@@ -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")
diff --git a/package/libroxml/libroxml-0002-wno-unused-result.patch b/package/libroxml/libroxml-0002-wno-unused-result.patch
deleted file mode 100644
index 406bf3c..0000000
--- a/package/libroxml/libroxml-0002-wno-unused-result.patch
+++ /dev/null
@@ -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")
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index ca32bf9..f1b2486 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -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))
--
618FE3EF
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] libroxml: bump version to 2.3.0
2014-02-01 23:07 ` [Buildroot] [PATCH v2] " blunderer at blunderer.org
@ 2014-02-02 6:51 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-02-02 6:51 UTC (permalink / raw)
To: buildroot
>>>>> "blunderer" == blunderer <blunderer@blunderer.org> writes:
> From: Tristan Lelong <tristan.lelong@blunderer.org>
> 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>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libroxml: bump version to 2.3.0
2014-02-01 22:30 ` Tristan Lelong
@ 2014-02-02 10:05 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-02-02 10:05 UTC (permalink / raw)
To: buildroot
Dear Tristan Lelong,
On Sat, 1 Feb 2014 14:30:44 -0800, Tristan Lelong wrote:
> I will add this linking exception.
>
> Regarding Documentation and tests, this is disabled by default, so we
> shouldn't need anymore configuration option.
Ok.
> 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.
See
http://git.buildroot.net/buildroot/commit/package/libroxml?id=267edbf9aa24faa688bcc6785ffb8d50059195f8
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-02 10:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-31 17:36 [Buildroot] [PATCH] libroxml: bump version to 2.3.0 blunderer at blunderer.org
2014-02-01 8:45 ` Thomas Petazzoni
2014-02-01 22:30 ` Tristan Lelong
2014-02-02 10:05 ` Thomas Petazzoni
2014-02-01 23:07 ` [Buildroot] [PATCH v2] " blunderer at blunderer.org
2014-02-02 6:51 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.