29b83f0527
In order to match the new upstream name, rename the gdisk package to gptfdisk. We add the relevant legacy configuration options to ensure a smooth transition for users. [Peter: fixup Config.in indentation] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
[PATCH] Disable UTF16 support
|
|
|
|
libicu is quite large, and unicode partition names are uncommon.
|
|
|
|
Signed-off-by: Justin Maggard <jmaggard10@gmail.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 @@
|
|
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
|