From 6f103474ad6387cb5a00dc3419efc52e78afe5a5 Mon Sep 17 00:00:00 2001 From: Dan Pattison Date: Thu, 1 Sep 2011 07:47:49 -0700 Subject: [PATCH] libconfuse: bump to version 2.7 Old libconfuse version 2.6 is from year 2007 so bump to version 2.7 Updated download URL in libconfuse.mk / Config.in Removed libconfuse-2.6-dont-use-werror.patch Changed := to just = Signed-off-by: Dan Pattison Signed-off-by: Peter Korsgaard --- package/libconfuse/Config.in | 2 +- .../libconfuse-2.6-dont-use-werror.patch | 34 ------------------- package/libconfuse/libconfuse.mk | 15 ++++---- 3 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 package/libconfuse/libconfuse-2.6-dont-use-werror.patch diff --git a/package/libconfuse/Config.in b/package/libconfuse/Config.in index e123dab48c..be18cbb073 100644 --- a/package/libconfuse/Config.in +++ b/package/libconfuse/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCONFUSE environment variable expansion, functions and nested include statements. - http://www.nongnu.org/confuse/ + http://savannah.nongnu.org/download/confuse/ diff --git a/package/libconfuse/libconfuse-2.6-dont-use-werror.patch b/package/libconfuse/libconfuse-2.6-dont-use-werror.patch deleted file mode 100644 index 50d0733264..0000000000 --- a/package/libconfuse/libconfuse-2.6-dont-use-werror.patch +++ /dev/null @@ -1,34 +0,0 @@ -confuse: don't compile with -Werror - -Werror isn't really a robust setting for !development. ---- - src/Makefile.am | 2 +- - src/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: confuse-2.6/src/Makefile.am -=================================================================== ---- confuse-2.6.orig/src/Makefile.am -+++ confuse-2.6/src/Makefile.am -@@ -10,7 +10,7 @@ - DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ - - if cc_is_gcc --AM_CFLAGS=-Wall -Werror -+AM_CFLAGS=-Wall - endif - - LIBS = @LIBS@ -Index: confuse-2.6/src/Makefile.in -=================================================================== ---- confuse-2.6.orig/src/Makefile.in -+++ confuse-2.6/src/Makefile.in -@@ -196,7 +196,7 @@ - libconfuse_la_SOURCES = confuse.c lexer.l - libconfuse_la_LIBADD = $(LTLIBINTL) - include_HEADERS = confuse.h --@cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror -+@cc_is_gcc_TRUE@AM_CFLAGS = -Wall - CLEANFILES = *~ \#*\# - AM_LFLAGS = -Pcfg_yy -olex.yy.c - all: all-am diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 03aa0bcd57..28115d74f0 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -3,13 +3,14 @@ # libconfuse # ############################################################# -LIBCONFUSE_VERSION:=2.6 -LIBCONFUSE_SOURCE:=confuse-$(LIBCONFUSE_VERSION).tar.gz -LIBCONFUSE_SITE:=http://bzero.se/confuse/ -LIBCONFUSE_AUTORECONF:=NO -LIBCONFUSE_INSTALL_STAGING:=YES -LIBCONFUSE_INSTALL_TARGET:=YES +LIBCONFUSE_VERSION = 2.7 +LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.gz +LIBCONFUSE_SITE = http://savannah.nongnu.org/download/confuse/ +LIBCONFUSE_AUTORECONF = NO +LIBCONFUSE_INSTALL_STAGING = YES -LIBCONFUSE_CONF_OPT:=--disable-rpath +LIBCONFUSE_CONF_OPT = --disable-rpath + +LIBCONFUSE_DEPENDENCIES = uclibc $(eval $(call AUTOTARGETS,package,libconfuse)) -- 2.30.2