Build libgd2 without iconv for Nevis

diff --git a/make/archives.mk b/make/archives.mk
index 468adec1cafa49d4d192636153931002939036e1..07c365a97193191505e79081ff912c596a8c2c26 100755 (executable)
--- 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 ecfe1d96df3b040dc2c58bbf581da592598d986f..49446c6a5f2954aad8fc17ee8ffa7088c7b00af2 100755 (executable)
--- 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 5888753b7ec8522edc2891e698e2c5f159277ab6..69f1873f753f662a3d1bda349a3dcc353e8e6cc6 100644 (file)
--- 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