diff options
author | John-Mark Bell <jmb@netsurf-browser.org> | 2014-01-14 23:30:12 +0000 |
---|---|---|
committer | John-Mark Bell <jmb@netsurf-browser.org> | 2014-01-17 18:55:42 +0000 |
commit | 92200bd9ffebb81769913dc60fbb367cd21b893d (patch) | |
tree | e1700b45df9bb16898a269d0f9259f201f2b0b28 | |
parent | 6bb0b771b22b3d12cb6f2f94cdbb9251db9ca973 (diff) | |
download | toolchains-92200bd9ffebb81769913dc60fbb367cd21b893d.tar.gz toolchains-92200bd9ffebb81769913dc60fbb367cd21b893d.tar.bz2 |
Remove liblcms and libmng: no longer used
-rw-r--r-- | sdk/Makefile | 39 | ||||
-rw-r--r-- | sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p | 13 | ||||
-rw-r--r-- | sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p | 10 | ||||
-rw-r--r-- | sdk/recipes/patches/libmng/makefile.unix.p | 50 |
4 files changed, 1 insertions, 111 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index ae46e58..ad6cf2f 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -30,8 +30,6 @@ VERSION_LIBXML := 2.9.1 VERSION_OPENSSL := 1.0.1f VERSION_LIBPNG := 1.6.8 VERSION_LIBJPEG := 8d -VERSION_LIBLCMS := 2.3 -VERSION_LIBMNG := 1.0.10 VERSION_LIBCARES := 1.10.0 VERSION_LIBCURL := 7.34.0 VERSION_LIBGNURX := 2.5.1 @@ -81,8 +79,7 @@ FETCHSRC := $(CURDIR)/fetchsrc # Compute the SDK components SDK_ITEMS := -COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libjpeg.d liblcms.d \ - libmng.d libcares.d libcurl.d libexpat.d +COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libjpeg.d libcares.d libcurl.d libexpat.d LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap telnet gopher tftp pop3 imap smtp manual) @@ -395,40 +392,6 @@ $(BUILDSTEPS)/libjpeg-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/jpegsrc.v$(V $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@ -# liblcms -$(BUILDSTEPS)/liblcms.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms-src.d - mkdir -p $(BUILDDIR)/liblcms - cd $(BUILDDIR)/liblcms && tar xaf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz - for p in `ls $(RECIPES)/patches/liblcms/*.p` ; do $(PATCH) -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done -ifneq ($(realpath $(RECIPES)/patches/liblcms/$(TARGET)),) - for p in `ls $(RECIPES)/patches/liblcms/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done -endif - cd $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared - cd $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) && $(env) make install - touch $@ - -$(BUILDSTEPS)/liblcms-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz - touch $@ - -$(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/lcms/lcms/$(VERSION_LIBLCMS)/$(subst $(SOURCEDIR)/,,$@)" $@ - - -# libMNG -$(BUILDSTEPS)/libmng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms.d $(BUILDSTEPS)/libmng-src.d - mkdir -p $(BUILDDIR)/libmng - cd $(BUILDDIR)/libmng && tar xaf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz - for p in `ls $(RECIPES)/patches/libmng/*.p` ; do $(PATCH) -d $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) -p0 <$$p ; done - cp $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/makefiles/makefile.unix $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/Makefile - cd $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) && $(env) make install - touch $@ - -$(BUILDSTEPS)/libmng-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz - touch $@ - -$(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/libmng/libmng-devel/$(VERSION_LIBMNG)/$(subst $(SOURCEDIR)/,,$@)" $@ - # libcares $(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d mkdir -p $(BUILDDIR)/libcares diff --git a/sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p b/sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p deleted file mode 100644 index dad4aa8..0000000 --- a/sdk/recipes/patches/liblcms/m68k-atari-mint/sqrtf.p +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lcms2_internal.h 2010-11-29 16:11:49.000000000 +0000 -+++ src/lcms2_internal.h 2011-05-14 02:22:34.000000000 +0100 -@@ -52,6 +52,10 @@ - #define sqrtf(x) (float)sqrt((float)x) - #endif - -+// MiNTLib omits sqrtf -+#ifdef __MINT__ -+#define sqrtf(x) (float)sqrt((float)x) -+#endif - - // Alignment of ICC file format uses 4 bytes (cmsUInt32Number) - #define _cmsSIZEOFLONGMINUS1 (sizeof(cmsUInt32Number)-1) diff --git a/sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p b/sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p deleted file mode 100644 index 4f44bc2..0000000 --- a/sdk/recipes/patches/liblcms/ppc-amigaos/memory.h.p +++ /dev/null @@ -1,10 +0,0 @@ ---- include/lcms2_plugin.h.orig 2011-03-08 22:56:29.000000000 +0000 -+++ include/lcms2_plugin.h 2011-03-08 22:56:44.000000000 +0000 -@@ -50,7 +50,6 @@ - #include <stdlib.h> - #include <math.h> - #include <stdarg.h> --#include <memory.h> - #include <string.h> - - diff --git a/sdk/recipes/patches/libmng/makefile.unix.p b/sdk/recipes/patches/libmng/makefile.unix.p deleted file mode 100644 index 46c2cb7..0000000 --- a/sdk/recipes/patches/libmng/makefile.unix.p +++ /dev/null @@ -1,50 +0,0 @@ ---- makefiles/makefile.unix.org 2007-12-26 16:20:25.000000000 +0100 -+++ makefiles/makefile.unix 2007-12-26 16:18:02.000000000 +0100 -@@ -7,20 +7,24 @@ - # Configuration options are now in libmng_conf.h - - # The name of your C compiler: --CC= cc -+CC= $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) -+AR= $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar) -+ -+# where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h -+prefix=$(GCCSDK_INSTALL_ENV) - - # Location of jpeg header files --JPEG_INC= /cs/include/jpeg -+JPEG_INC= $(prefix)/include - - # Location of zlib header files --ZLIB_INC= /cs/include -+ZLIB_INC= $(prefix)/include - - # Location of lcms header files - # (switch on MNG_FULL_CMS in libmng_conf.h if you want to use this) --LCMS_INC= /ltmp/lcms-1.06/source -+LCMS_INC= $(prefix)/include - - # compiler options: --CFLAGS= -O -I. -I$(ZLIB_INC) -I$(JPEG_INC) -I$(LCMS_INC) -+CFLAGS= -O3 -I. -I$(ZLIB_INC) -I$(JPEG_INC) -I$(LCMS_INC) - - # source files - SOURCES= \ -@@ -59,7 +63,16 @@ - /bin/rm -f *~ core - - libmng.a: $(OBJECTS) -- ar r libmng.a $(OBJECTS) -+ $(AR) r libmng.a $(OBJECTS) -+ -+INCPATH=$(prefix)/include -+LIBPATH=$(prefix)/lib -+ -+install: libmng.a -+ -@mkdir -p $(INCPATH) $(LIBPATH) -+ cp libmng.h libmng_conf.h libmng_types.h $(INCPATH) -+ chmod 644 $(INCPATH)/libmng.h $(INCPATH)/libmng_conf.h $(INCPATH)/libmng_types.h -+ cp libmng.a $(LIBPATH) - - depend: - makedepend -- $(CFLAGS) $(IFLAGS) -- *.c |