From 428e6285df66d83eef179ac6df93a0f7e3db1a66 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Aug 2014 11:55:53 +0200 Subject: update to latest upstream, problem reported by joerg --- package/parted/Makefile | 18 ++++++++++++------ package/parted/patches/patch-lib_stdio_in_h | 10 ---------- 2 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 package/parted/patches/patch-lib_stdio_in_h (limited to 'package/parted') diff --git a/package/parted/Makefile b/package/parted/Makefile index 8de45556c..d469f0863 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -4,21 +4,27 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= parted -PKG_VERSION:= 3.1 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 5d89d64d94bcfefa9ce8f59f4b81bdcb +PKG_VERSION:= 3.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0247b6a7b314f8edeb618159fa95f9cb PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs PKG_DEPENDS:= libblkid libuuid libreadline libpthread -PKG_BUILDDEP:= util-linux readline +PKG_DEPENDS+= libdevmapper +PKG_BUILDDEP:= util-linux readline lvm PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} +PKG_BUILDDEP_UCLIBC:= libiconv-tiny +PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny + include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y) +TARGET_LDFLAGS+= -liconv +endif -CONFIGURE_ARGS+= --disable-device-mapper +$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) parted-install: ${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib diff --git a/package/parted/patches/patch-lib_stdio_in_h b/package/parted/patches/patch-lib_stdio_in_h deleted file mode 100644 index 1fe225d7b..000000000 --- a/package/parted/patches/patch-lib_stdio_in_h +++ /dev/null @@ -1,10 +0,0 @@ ---- parted-3.0.orig/lib/stdio.in.h 2011-05-30 09:07:16.000000000 +0200 -+++ parted-3.0/lib/stdio.in.h 2013-02-11 15:51:17.000000000 +0100 -@@ -735,7 +735,6 @@ _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - - -- cgit v1.2.3