From 6c83b40a1b2d1eb46de50d49572db13a4ce59f03 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 7 Mar 2013 10:45:28 +0000 Subject: gptfdisk: make utf16 support configurable Instead of always disabling the UTF16 support, make it configurable. When ICU is available, enable UTF16 support, otherwise disable it. [Peter: wrap long line] Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- .../gptfdisk-001-configurable-utf16-support.patch | 48 ++++++++++++++++++++++ package/gptfdisk/gptfdisk-001-no-utf16.patch | 43 ------------------- package/gptfdisk/gptfdisk.mk | 7 +++- 3 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch delete mode 100644 package/gptfdisk/gptfdisk-001-no-utf16.patch (limited to 'package/gptfdisk') diff --git a/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch new file mode 100644 index 000000000..2d51e6f7b --- /dev/null +++ b/package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch @@ -0,0 +1,48 @@ +[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 +Signed-off-by: Thomas Petazzoni +--- +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 -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 -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 -o sgdisk + + fixparts: $(MBR_LIB_OBJS) fixparts.o + $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts diff --git a/package/gptfdisk/gptfdisk-001-no-utf16.patch b/package/gptfdisk/gptfdisk-001-no-utf16.patch deleted file mode 100644 index 540e74190..000000000 --- a/package/gptfdisk/gptfdisk-001-no-utf16.patch +++ /dev/null @@ -1,43 +0,0 @@ -[PATCH] Disable UTF16 support - -libicu is quite large, and unicode partition names are uncommon. - -Signed-off-by: Justin Maggard ---- -diff -ur gdisk-0.8.5/Makefile gptfdisk-0.8.5/Makefile ---- gdisk-0.8.5/Makefile 2012-05-30 08:38:43.000000000 -0700 -+++ gptfdisk-0.8.5/Makefile 2012-06-05 11:38:23.710597974 -0700 -@@ -1,8 +1,8 @@ - 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 -D USE_UTF16 -+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 - 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 +14,16 @@ - 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) -luuid -o gdisk -+# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -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) -luuid -lncurses -o cgdisk -+# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -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) -luuid -lpopt -o sgdisk -+# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk - - fixparts: $(MBR_LIB_OBJS) fixparts.o - $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 988eecf08..0478041d9 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -15,9 +15,14 @@ ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) GPTFDISK_DEPENDENCIES += popt endif +ifeq ($(BR2_PACKAGE_ICU),y) + GPTFDISK_DEPENDENCIES += icu + GPTFDISK_MAKE_OPTS += USE_UTF16=y +endif + define GPTFDISK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(GPTFDISK_TARGETS_y) + $(GPTFDISK_MAKE_OPTS) $(GPTFDISK_TARGETS_y) endef define GPTFDISK_INSTALL_TARGET_CMDS -- cgit v1.2.3