gptfdisk: bump to version 0.8.10
Drop the ICU patch and ICU support since it's no longer necessary. Use original hashes from sourceforge. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
519d36e085
commit
fac3042cc5
|
@ -1,50 +0,0 @@
|
|||
[PATCH] Make the UTF16 support configurable
|
||||
|
||||
libicu is quite large, and unicode partition names are uncommon, so we
|
||||
may not necessarily want to have UTF16 support unconditionnally. This
|
||||
patch adds a USE_UTF16 environment variable to tell whether we want
|
||||
the UTF16 support or not.
|
||||
|
||||
Signed-off-by: Justin Maggard <jmaggard10@gmail.com>
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
[baruch: add $(LDLIBS)]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Index: b/Makefile
|
||||
===================================================================
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,8 +1,11 @@
|
||||
CC=gcc
|
||||
CXX=g++
|
||||
CFLAGS+=-D_FILE_OFFSET_BITS=64
|
||||
-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
|
||||
-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
|
||||
+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
|
||||
+ifeq ($(USE_UTF16),y)
|
||||
+CXXFLAGS+=-D USE_UTF16
|
||||
+UTF16_LIBS=-licuio -licuuc
|
||||
+endif
|
||||
LDFLAGS+=
|
||||
LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
|
||||
MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
|
||||
@@ -14,16 +17,13 @@
|
||||
all: cgdisk gdisk sgdisk fixparts
|
||||
|
||||
gdisk: $(LIB_OBJS) gdisk.o gpttext.o
|
||||
-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
|
||||
- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
|
||||
+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(UTF16_LIBS) -luuid $(LDLIBS) -o gdisk
|
||||
|
||||
cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
|
||||
-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
|
||||
- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
|
||||
+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lncurses $(LDLIBS) -o cgdisk
|
||||
|
||||
sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
|
||||
-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
|
||||
- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
|
||||
+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(UTF16_LIBS) -luuid -lpopt $(LDLIBS) -o sgdisk
|
||||
|
||||
fixparts: $(MBR_LIB_OBJS) fixparts.o
|
||||
$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
|
|
@ -38,6 +38,7 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
|
|||
config BR2_PACKAGE_GPTFDISK_CGDISK
|
||||
bool "ncurses cgdisk"
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
|
||||
help
|
||||
Install the ncurses-based GUID partition table (GPT)
|
||||
manipulator /usr/sbin/cgdisk.
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
# Locally computed:
|
||||
sha256 4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2 gptfdisk-0.8.6.tar.gz
|
||||
# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/0.8.10/
|
||||
md5 9cf4246c181c324bdbd553fe9b348373 gptfdisk-0.8.10.tar.gz
|
||||
sha1 1708e232220236b6bdf299b315e9bc2205c01ba5 gptfdisk-0.8.10.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
GPTFDISK_VERSION = 0.8.6
|
||||
GPTFDISK_VERSION = 0.8.10
|
||||
GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
|
||||
GPTFDISK_LICENSE = GPLv2+
|
||||
GPTFDISK_LICENSE_FILES = COPYING
|
||||
|
@ -21,11 +21,6 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y)
|
|||
GPTFDISK_DEPENDENCIES += ncurses
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ICU),y)
|
||||
GPTFDISK_DEPENDENCIES += icu
|
||||
GPTFDISK_MAKE_OPTS += USE_UTF16=y
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy)
|
||||
GPTFDISK_MAKE_OPTS += LDLIBS=-lintl
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue