From patchwork Fri Jan 31 17:36:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: blunderer@blunderer.org X-Patchwork-Id: 315798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id C59C62C00AF for ; Sat, 1 Feb 2014 04:37:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1ECD18A863; Fri, 31 Jan 2014 17:37:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n29-a8xGU3xJ; Fri, 31 Jan 2014 17:37:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4AEB28A86A; Fri, 31 Jan 2014 17:37:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 027101BF9EB for ; Fri, 31 Jan 2014 17:37:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 076192534C for ; Fri, 31 Jan 2014 17:37:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l4ihIZcZFSzm for ; Fri, 31 Jan 2014 17:37:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by silver.osuosl.org (Postfix) with ESMTPS id B45BC2F9B7 for ; Fri, 31 Jan 2014 17:37:11 +0000 (UTC) Received: by mail-pa0-f41.google.com with SMTP id fa1so4693027pad.14 for ; Fri, 31 Jan 2014 09:37:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=thm/BilXgBWHgWUQs/mNc5IWC3ITe6VvJy0N23sjGKw=; b=hMnVQN6uGeADenomofu47rOYOANr8pZdrVzyozpFs7DqHl85mKzRuX1n5KImWikJ1K wrSIaHqnnwBV1TGeRyGylla7cH8AGVUeghCQZwjXXSPZtztyA27MX95gF5fYRAutcAE3 A/nZr522rnjgD1woHqHFS2V3U8VJr4LYnT7ICJa9XuRIBOM9yvNQHuxjsBbGnCqkjwU2 ZbqS5LC4vJeHTP+pCcathDLMVi0ldOwFyLvcUd3V9sHIoQeVQhENuaVOjv0VDOC+S9Jm jRNCOzCjBcMKhsoF8pMVaQFnPEg60AK+6vG9hSgBB7B5VhDae5vXir2nX3dlDLDSxYvR VkyA== X-Received: by 10.66.246.229 with SMTP id xz5mr22177128pac.119.1391189831324; Fri, 31 Jan 2014 09:37:11 -0800 (PST) Received: from LE6440.adeneo-embedded.us (173-10-76-58-BusName-Washington.hfc.comcastbusiness.net. [173.10.76.58]) by mx.google.com with ESMTPSA id i10sm72202588pat.11.2014.01.31.09.37.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Jan 2014 09:37:10 -0800 (PST) From: blunderer@blunderer.org To: buildroot@uclibc.org Date: Fri, 31 Jan 2014 09:36:42 -0800 Message-Id: <1391189802-5284-1-git-send-email-blunderer@blunderer.org> X-Mailer: git-send-email 1.8.5.2 Cc: Tristan Lelong , Tristan Lelong Subject: [Buildroot] [PATCH] libroxml: bump version to 2.3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Tristan Lelong 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 --- 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 ---- - 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 - -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))