Commit 6c83b40a authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a4b61bf3

package/gptfdisk/gptfdisk-001-no-utf16.patch→package/gptfdisk/gptfdisk-001-configurable-utf16-support.patch

+19 −14
Original line number Diff line number Diff line 
[PATCH] Disable UTF16 support

[PATCH] Make the UTF16 support configurable



libicu is quite large, and unicode partition names are uncommon.

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>

---

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 @@

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 -D USE_UTF16

+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 +14,16 @@

@@ -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) -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) -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) -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

package/gptfdisk/gptfdisk.mk

+6 −1
Original line number Diff line number Diff line
@@ -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