diff --git a/make/target-tools.mk b/make/target-tools.mk index 12cdba1e..80108755 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1110,7 +1110,7 @@ minisatip: $(MINISATIP_DEPENDENCIES) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -GPTFDISK_VERSION = 1.0.4 +GPTFDISK_VERSION = 1.0.7 GPTFDISK_DIR = gptfdisk-$(GPTFDISK_VERSION) GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VERSION).tar.gz GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VERSION) diff --git a/package/gptfdisk/patches/gptfdisk-ldlibs.patch b/package/gptfdisk/patches/gptfdisk-ldlibs.patch deleted file mode 100644 index 94952977..00000000 --- a/package/gptfdisk/patches/gptfdisk-ldlibs.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add $(LDLIBS) support to enable clean static builds (for libintl). - -Signed-off-by: Gustavo Zacarias - -diff -Nura gptfdisk-0.8.10.orig/Makefile gptfdisk-0.8.10/Makefile ---- gptfdisk-0.8.10.orig/Makefile 2015-05-01 08:45:14.667748141 -0300 -+++ gptfdisk-0.8.10/Makefile 2015-05-01 08:45:42.685699419 -0300 -@@ -12,19 +12,19 @@ - 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) -luuid $(LDLIBS) -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 -lncursesw -o cgdisk -+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw $(LDLIBS) -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) -luuid -lpopt $(LDLIBS) -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 -+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) $(LDLIBS) -o fixparts - - test: - ./gdisk_test.sh