From c7b66ae6cb9ccdec145da6710548547d5cc7e562 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Tue, 5 Apr 2016 22:31:07 -0700 Subject: [PATCH] Minor header tweaks to build for MiNT (m68k-atari-mint); Update tested platforms for MiNT, Alpine Linux & HardenedBSD --- ReadMe-2.4.3 | 11 +++++++---- src/core/file.h | 4 +++- src/cryptlib/misc.h | 5 +++++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ReadMe-2.4.3 b/ReadMe-2.4.3 index 601b14a..9d9d296 100644 --- a/ReadMe-2.4.3 +++ b/ReadMe-2.4.3 @@ -26,6 +26,7 @@ Linuxes - CentOS 7 (amd64) + gcc 4.8.5 - Ubuntu 14.0.4 (amd64) + gcc 4.x - RHEL 3.4 (Itanium) + gcc 3.4.3 +- Alpine Linux 3.3.3 + gcc 5.3.0 - Android 6.0 + gcc 4.9 - Raspbian 7 (wheezy) (armv6l) + gcc 4.6.3 @@ -38,6 +39,7 @@ BSDs - NetBSD 6.0 (x86) + gcc 4.5.1 - DragonflyBSD 4.4.2 + gcc 5.2.1 - MidnightBSD 0.7 + gcc 4.2.1 +- HardenedBSD 11.0 + gcc 4.8.5 UNIXes - Solaris 10 x86 + gcc 3.4.3 @@ -54,6 +56,7 @@ Other - SkyOS 5 (beta 6947) + gcc 4.1.1 - Sortix 1.0 + gcc 5.3.0 - Icaros 2.1 (AROS) + gcc 4.6.4 +- MiNT 1.17 (Atari ST/TT) + gcc 4.6.4 Building Notes: @@ -66,10 +69,10 @@ what you expect. For example, even if a program is statically linked with glibc, the static glibc code may still load shared libraries behind the scenes, for things like iconv character conversion and nsswitch name lookups. -* Recent Android versions may require additional compiler & linker arguments: -“-fPIE" in CFLAGS and "-fPIE -pie" in LDFLAGS. It's simplest to add these -to configure.in and run autoreconf -i instead of hand-editing each Makefile -individually. +* To create PIE (Position-Independent Executable) binaries, add “-fPIE" to CFLAGS +and "-fPIE -pie" to LDFLAGS. This is required by recent Android versions, and +may be desirable elsewhere. It's simplest to add these to configure.in and run +autoreconf -i instead of hand-editing each Makefile individually. diff --git a/src/core/file.h b/src/core/file.h index 3289660..d36bd61 100644 --- a/src/core/file.h +++ b/src/core/file.h @@ -47,7 +47,9 @@ #include "fileerror.h" #endif - +#ifdef __MINT__ // for off_t +#include +#endif //============================================================================= // eFile exception class diff --git a/src/cryptlib/misc.h b/src/cryptlib/misc.h index 091c9ef..73b8388 100644 --- a/src/cryptlib/misc.h +++ b/src/cryptlib/misc.h @@ -8,6 +8,11 @@ #else #include #endif + +#ifdef __MINT__ // has memory.h, but memset defined in string.h anyway. + #include +#endif + #include inline unsigned int bitsToBytes(unsigned int bitCount)