libroxml: update to new buildsystem

PATCH New blunderer at blunderer.org 2 participants 4 messages Jan 30, 2014 – Jan 31, 2014

lore

Share & tools

lore

blunderer at blunderer.org

author

2014-01-30 22:52 UTC #0 lore raw

PATCH 1/2 libroxml: update to new buildsystem

From: Tristan Lelong <[email protected]>

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 <[email protected]>

---
 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

package/libroxml/libroxml-0001-werror.patch deleted +0 ~~-22~~

deleted file mode 100644
index 91f322c..0000000
@@ -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~~

deleted file mode 100644
index 406bf3c..0000000
@@ -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 +4 ~~-18~~

index ca32bf9..8a1c653 100644
@@ -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))

Signature · 1 line

618FE3EF

blunderer at blunderer.org

author

2014-01-30 22:52 UTC #1 lore raw

PATCH 2/2 libroxml: bump version to 2.3.0

From: Tristan Lelong <[email protected]>

Signed-off-by Tristan Lelong <[email protected]>

---
 package/libroxml/libroxml.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/libroxml/libroxml.mk +1 -1

index 8a1c653..fac94b5 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-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+

Signature · 1 line

618FE3EF

Thomas Petazzoni

2014-01-31 08:14 UTC #2 lore raw

PATCH 1/2 libroxml: update to new buildsystem

In reply to blunderer at blunderer.org

Tristan,

Quoted 3 lines · blunderer at blunderer.org

From: Tristan Lelong <[email protected]>
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

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Tristan Lelong

author

2014-01-31 17:29 UTC #3 lore raw

PATCH 1/2 libroxml: update to new buildsystem

The autotools were introduced in version 2.3.0. I will merge those 2 patches and resubmit.

Thanks

2014-01-31 Thomas Petazzoni <[email protected]>:

Quoted 18 lines

Tristan,
Quoted 3 lines · blunderer at blunderer.org
From: Tristan Lelong <[email protected]>
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

Signature · 4 lines

618FE3EF
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140131/f57fd002/attachment.html>