| Message ID | 1391189802-5284-1-git-send-email-blunderer@blunderer.org |
|---|---|
| State | Superseded |
| Headers | show |
Hello, On Fri, 31 Jan 2014 09:36:42 -0800, blunderer@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
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@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 >
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
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))