From 6a97a76ebd6d1a21a976a209addbf84be5488a22 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 24 Jun 2019 00:16:43 +0200
Subject: [PATCH] - gptfdisk: update build

---
 make/system-tools.mk          |  3 +++
 patches/gptfdisk-ldlibs.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 patches/gptfdisk-ldlibs.patch

diff --git a/make/system-tools.mk b/make/system-tools.mk
index 52880069..989d288a 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -1495,10 +1495,13 @@ GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz
 $(ARCHIVE)/$(GPTFDISK_SOURCE):
 	$(WGET) http://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER)/$(GPTFDISK_SOURCE)
 
+GPTFDISK_PATCH  = gptfdisk-ldlibs.patch
+
 $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/gptfdisk-$(GPTFDISK_VER)
 	$(UNTAR)/$(GPTFDISK_SOURCE)
 	$(CHDIR)/gptfdisk-$(GPTFDISK_VER); \
+		$(call apply_patches, $(GPTFDISK_PATCH)); \
 		sed -i 's|^CC=.*|CC=$(TARGET)-gcc|' Makefile; \
 		sed -i 's|^CXX=.*|CXX=$(TARGET)-g++|' Makefile; \
 		$(BUILDENV) \
diff --git a/patches/gptfdisk-ldlibs.patch b/patches/gptfdisk-ldlibs.patch
new file mode 100644
index 00000000..94952977
--- /dev/null
+++ b/patches/gptfdisk-ldlibs.patch
@@ -0,0 +1,31 @@
+Add $(LDLIBS) support to enable clean static builds (for libintl).
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+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