diff mbox

[1/2] libroxml: update to new buildsystem

Message ID 1391122365-5347-1-git-send-email-blunderer@blunderer.org
State Superseded
Headers show

Commit Message

blunderer@blunderer.org Jan. 30, 2014, 10:52 p.m. UTC 
From: Tristan Lelong <tristan.lelong@blunderer.org>

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                       | 22 ++++------------------
 3 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 package/libroxml/libroxml-0001-werror.patch
 delete mode 100644 package/libroxml/libroxml-0002-wno-unused-result.patch

Comments

Thomas Petazzoni Jan. 31, 2014, 8:14 a.m. UTC | #1 
Tristan,

On Thu, 30 Jan 2014 14:52:44 -0800, blunderer@blunderer.org wrote:
> From: Tristan Lelong <tristan.lelong@blunderer.org>
> 
> libroxml is now using autotools.

Are they using autotools in libroxml 2.2.3, or only starting from
libroxml 2.3.0 ?

In the later case, then your two patches should be merged into one.

Thomas
blunderer@blunderer.org Jan. 31, 2014, 5:29 p.m. UTC | #2 
The autotools were introduced in version 2.3.0. I will merge those 2
patches and resubmit.

Thanks


2014-01-31 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>:

> Tristan,
>
> On Thu, 30 Jan 2014 14:52:44 -0800, blunderer@blunderer.org wrote:
> > From: Tristan Lelong <tristan.lelong@blunderer.org>
> >
> > libroxml is now using autotools.
>
> Are they using autotools in libroxml 2.2.3, or only starting from
> libroxml 2.3.0 ?
>
> In the later case, then your two patches should be merged into one.
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>
diff mbox

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..8a1c653 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -7,23 +7,9 @@ 
 LIBROXML_VERSION = 2.2.3
 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))