From e1ffdff6964514515fc640544ccb39e2140d4ca5 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 29 Dec 2010 16:51:07 +0000 Subject: Build runes for an SDK containing the upstream packages we need svn path=/toolchains/; revision=11136 --- sdk/recipes/patches/libcurl/lib.easy.c.p | 27 ++++++++++++++++ sdk/recipes/patches/libcurl/src.main.c.p | 13 ++++++++ sdk/recipes/patches/libmng/makefile.unix.p | 50 ++++++++++++++++++++++++++++++ sdk/recipes/patches/openssl/Configure.p | 11 +++++++ sdk/recipes/patches/zlib/Makefile.in.p | 12 +++++++ 5 files changed, 113 insertions(+) create mode 100644 sdk/recipes/patches/libcurl/lib.easy.c.p create mode 100644 sdk/recipes/patches/libcurl/src.main.c.p create mode 100644 sdk/recipes/patches/libmng/makefile.unix.p create mode 100644 sdk/recipes/patches/openssl/Configure.p create mode 100644 sdk/recipes/patches/zlib/Makefile.in.p (limited to 'sdk/recipes/patches') diff --git a/sdk/recipes/patches/libcurl/lib.easy.c.p b/sdk/recipes/patches/libcurl/lib.easy.c.p new file mode 100644 index 0000000..c98b845 --- /dev/null +++ b/sdk/recipes/patches/libcurl/lib.easy.c.p @@ -0,0 +1,27 @@ +--- lib/easy.c.old 2010-12-29 16:14:23.000000000 +0000 ++++ lib/easy.c 2010-12-29 16:15:10.000000000 +0000 +@@ -263,13 +263,6 @@ + return CURLE_FAILED_INIT; + } + +-#ifdef __AMIGA__ +- if(!amiga_init()) { +- DEBUGF(fprintf(stderr, "Error: amiga_init failed\n")); +- return CURLE_FAILED_INIT; +- } +-#endif +- + #ifdef NETWARE + if(netware_init()) { + DEBUGF(fprintf(stderr, "Warning: LONG namespace not available\n")); +@@ -358,10 +351,6 @@ + if(init_flags & CURL_GLOBAL_WIN32) + win32_cleanup(); + +-#ifdef __AMIGA__ +- amiga_cleanup(); +-#endif +- + #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT) + (void)libssh2_exit(); + #endif diff --git a/sdk/recipes/patches/libcurl/src.main.c.p b/sdk/recipes/patches/libcurl/src.main.c.p new file mode 100644 index 0000000..749fe64 --- /dev/null +++ b/sdk/recipes/patches/libcurl/src.main.c.p @@ -0,0 +1,13 @@ +--- src/main.c.old 2010-12-29 16:18:04.000000000 +0000 ++++ src/main.c 2010-12-29 16:17:51.000000000 +0000 +@@ -64,6 +64,10 @@ + #endif + #endif + ++#ifdef __AMIGA__ ++#include ++#endif ++ + #include "version.h" + + #ifdef HAVE_IO_H /* typical win32 habit */ diff --git a/sdk/recipes/patches/libmng/makefile.unix.p b/sdk/recipes/patches/libmng/makefile.unix.p new file mode 100644 index 0000000..46c2cb7 --- /dev/null +++ b/sdk/recipes/patches/libmng/makefile.unix.p @@ -0,0 +1,50 @@ +--- 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 diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p new file mode 100644 index 0000000..7191fe5 --- /dev/null +++ b/sdk/recipes/patches/openssl/Configure.p @@ -0,0 +1,11 @@ +--- Configure.old 2010-12-29 02:43:14.000000000 +0000 ++++ Configure 2010-12-29 02:45:29.000000000 +0000 +@@ -412,6 +412,8 @@ + "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", + "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", + ++"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-unknown-amigaos-ranlib", ++ + #### SCO/Caldera targets. + # + # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. diff --git a/sdk/recipes/patches/zlib/Makefile.in.p b/sdk/recipes/patches/zlib/Makefile.in.p new file mode 100644 index 0000000..3d0f7a3 --- /dev/null +++ b/sdk/recipes/patches/zlib/Makefile.in.p @@ -0,0 +1,12 @@ +--- Makefile.in.old 2010-12-29 00:23:58.000000000 +0000 ++++ Makefile.in 2010-12-29 00:25:00.000000000 +0000 +@@ -168,7 +168,9 @@ + -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi + -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi + cp $(STATICLIB) $(DESTDIR)$(libdir) ++ifneq ($(SHAREDLIBV),) + cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) ++endif + cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) + -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 + -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ -- cgit v1.2.3