diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-05 00:12:43 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-01-11 13:10:07 +0000 |
| commit | 16619db6108a9f6078baa7013e55474aebcdedfe (patch) | |
| tree | c5c188be24c86d4d9cbf14c3c6ce554b41929945 /sdk/recipes/patches/openssl/m68k-unknown-amigaos | |
| parent | 3bc29efcbedcf844525f673d20b7c225b8b1da53 (diff) | |
| download | toolchains-16619db6108a9f6078baa7013e55474aebcdedfe.tar.gz toolchains-16619db6108a9f6078baa7013e55474aebcdedfe.tar.bz2 | |
Fix OpenSSL build for the m68k-unknown-amigaos toolchain
Diffstat (limited to 'sdk/recipes/patches/openssl/m68k-unknown-amigaos')
| -rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p | 16 | ||||
| -rw-r--r-- | sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p | 24 |
2 files changed, 40 insertions, 0 deletions
diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p new file mode 100644 index 0000000..3f3a4ec --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p @@ -0,0 +1,16 @@ +--- apps.c 2014-10-15 13:53:39.000000000 +0100 ++++ apps/apps.c 2015-01-05 21:02:13.650018727 +0000 +@@ -3009,9 +3009,11 @@ double app_tminterval(int stop,int usert + struct rusage rus; + struct timeval now; + static struct timeval tmstart; +- ++#if !defined(OPENSSL_SYS_AMIGAOS3) + if (usertime) getrusage(RUSAGE_SELF,&rus), now = rus.ru_utime; +- else gettimeofday(&now,NULL); ++ else ++#endif ++ gettimeofday(&now,NULL); + + if (stop==TM_START) tmstart = now; + else ret = ( (now.tv_sec+now.tv_usec*1e-6) diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p new file mode 100644 index 0000000..337dc87 --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p @@ -0,0 +1,24 @@ +--- crypto/ui/ui_openssl.c.orig 2011-03-08 22:37:51.000000000 +0000 ++++ crypto/ui/ui_openssl.c 2011-03-08 22:39:00.000000000 +0000 +@@ -220,6 +220,12 @@ + #undef SGTTY + #endif + ++#if defined(OPENSSL_SYS_AMIGAOS3) ++#undef TERMIOS ++#undef TERMIO ++#undef SGTTY ++#endif ++ + #ifdef TERMIOS + # include <termios.h> + # define TTY_STRUCT struct termios +@@ -268,7 +274,7 @@ + typedef int sig_atomic_t; + #endif + +-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) ++#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_AMIGAOS3) + /* + * This one needs work. As a matter of fact the code is unoperational + * and this is only a trick to get it compiled. |