From 6b0a1cc58165c5ae9ed913ae18875eb65f83067e Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sun, 19 Feb 2017 20:48:32 +0100
Subject: [PATCH] Build libgd2 without iconv for Nevis

---
 make/archives.mk  |  6 +++---
 make/libraries.mk | 24 ++++++++++++++++++------
 make/versions.mk  |  3 +++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/make/archives.mk b/make/archives.mk
index 468adec..07c365a 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -36,6 +36,9 @@ $(ARCHIVE)/fbshot-0.3.tar.gz:
 $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2:
 	$(WGET) http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VER)/freetype-$(FREETYPE_VER).tar.bz2
 
+$(ARCHIVE)/gd-$(GD_VER).tar.gz:
+	$(WGET) ftp://ftp.uni-duisburg.de/Graphics/gd-$(GD_VER).tar.gz
+
 $(ARCHIVE)/gettext-$(GETTEXT_VER).tar.xz:
 	$(WGET) http://ftp.gnu.org/pub/gnu/gettext/gettext-$(GETTEXT_VER).tar.xz
 
@@ -158,9 +161,6 @@ $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2:
 $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/wpa_supplicant-0.7.3.tar.gz
 
-$(ARCHIVE)/gd-2.0.35.tar.gz:
-	$(WGET) http://www.fhloston-paradise.de/gd-2.0.35.tar.gz
-
 $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2:
 	$(WGET) http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VER)/libusb-$(LIBUSB_VER).tar.bz2
 
diff --git a/make/libraries.mk b/make/libraries.mk
index ecfe1d9..49446c6 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -635,9 +635,13 @@ $(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMP_VER).tar.bz2 $(D)/lib
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb.pc
 	touch $@
 
-$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(D)/libiconv $(ARCHIVE)/gd-2.0.35.tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/gd-2.0.35.tar.gz
-	pushd $(BUILD_TMP)/gd/2.0.35/ && \
+ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
+  LIBICONV = $(D)/libiconv
+  WITH_ICONV = --with-libiconv-prefix=$(TARGETPREFIX)
+endif
+$(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(LIBICONV) $(ARCHIVE)/gd-$(GD_VER).tar.gz | $(TARGETPREFIX)
+	$(UNTAR)/gd-$(GD_VER).tar.gz
+	pushd $(BUILD_TMP)/gd-$(GD_VER) && \
 		sed -i 's@if (!png_check_sig (sig, 8)) { /* bad signature */@if (png_sig_cmp(sig, 0, 8) != 0) { /* bad signature */@' gd_png.c && \
 		sed -i 's@libpng12@libpng15@' configure && \
 		sed -i 's@LIBPNG12@LIBPNG15@' configure && \
@@ -650,12 +654,20 @@ $(D)/libgd2: $(D)/zlib $(D)/libpng $(D)/libjpeg $(D)/freetype $(D)/libiconv $(AR
 		chmod +w configure && \
 		chmod +w aclocal.m4 && \
 		$(BUILDENV) \
-		./configure --prefix= --build=$(BUILD) --host=$(TARGET) --bindir=/.remove \
-		--with-png=$(TARGETPREFIX)/include/libpng15 --with-jpeg=$(TARGETPREFIX)/include --with-freetype=$(TARGETPREFIX)/include/freetype2 --with-libiconv-prefix=$(TARGETPREFIX) --without-x && \
+		./configure \
+			--prefix= \
+			--build=$(BUILD) \
+			--host=$(TARGET) \
+			--bindir=/.remove \
+			--with-png=$(TARGETPREFIX)/include/libpng15 \
+			--with-jpeg=$(TARGETPREFIX)/include \
+			--with-freetype=$(TARGETPREFIX)/include/freetype2 \
+			--without-x \
+			$(WITH_ICONV) && \
 		autoreconf -fi && \
 		$(MAKE) && \
 		$(MAKE) install DESTDIR=$(TARGETPREFIX)
-	$(REMOVE)/gd
+	$(REMOVE)/gd-$(GD_VER)
 	rm -rf $(TARGETPREFIX)/.remove
 	$(REWRITE_LIBTOOL)/libgd.la
 	touch $@
diff --git a/make/versions.mk b/make/versions.mk
index 5888753..69f1873 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -21,6 +21,9 @@ GCC_VER_KRONOS = linaro-5.2-2015.11-2
 UCLIBC_BUILD  = 1
 USE_UCLIBC_NG = 0
 
+# libgd2; an open source code library for the dynamic creation of images
+GD_VER = 2.0.35
+
 GETTEXT_VER = 0.19.8
 
 # giflib: converting images replaces libungif
-- 
2.39.5