From: Phil Pennock <pdp@exim.org>
Date: Fri, 14 Sep 2018 17:43:02 +0000 (-0400)
Subject: Restore Darwin OS configuration
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/a3d83c9e8d57ba51cd246435b14604f995551802?ds=sidebyside

Restore Darwin OS configuration

MacStadium are providing us with free Mac Mini hosting as part of their
FOSS support.  I'm about to set it up.  Let's have out-of-repo tuning in
place before I begin.
---

diff --git a/src/OS/Makefile-Darwin b/src/OS/Makefile-Darwin
new file mode 100644
index 000000000..be0d9520b
--- /dev/null
+++ b/src/OS/Makefile-Darwin
@@ -0,0 +1,29 @@
+# Exim: OS-specific make file for Darwin (Mac OS X).
+
+CC=cc
+
+BASENAME_COMMAND=look_for_it
+CHOWN_COMMAND=/usr/sbin/chown
+CHMOD_COMMAND=/bin/chmod
+
+HAVE_SA_LEN=YES
+
+# Removed -DBIND_8_COMPAT for 4.61
+# CFLAGS=-O -no-cpp-precomp -DBIND_8_COMPAT
+
+CFLAGS=-O -no-cpp-precomp
+LIBRESOLV=-lresolv
+
+USE_DB = yes
+DBMLIB =
+
+X11=/usr/X11R6
+XINCLUDE=-I$(X11)/include
+XLFLAGS=-L$(X11)/lib
+X11_LD_LIB=$(X11)/lib
+
+EXIWHAT_PS_ARG=ax
+EXIWHAT_EGREP_ARG='/exim( |$$)'
+EXIWHAT_KILL_SIGNAL=-USR1
+
+# End
diff --git a/src/OS/os.h-Darwin b/src/OS/os.h-Darwin
new file mode 100644
index 000000000..f4087404e
--- /dev/null
+++ b/src/OS/os.h-Darwin
@@ -0,0 +1,48 @@
+/* Exim: OS-specific C header file for Darwin (Mac OS X) */
+
+/* #define CRYPT_H */  /* Apparently this isn't needed */
+
+#define HAVE_MMAP
+#define HAVE_SYS_MOUNT_H
+#define PAM_H_IN_PAM
+#define SIOCGIFCONF_GIVES_ADDR
+
+/* OSX 10.2 does not have poll.h, 10.3 does emulate it badly. */
+#define NO_POLL_H
+
+#define F_FREESP     O_TRUNC
+typedef struct flock flock_t;
+
+#define BASE_62 36  /* HFS+ aliases lower and upper cases in filenames.
+                               Consider reducing MAX_LOCALHOST_NUMBER */
+
+#ifndef        _BSD_SOCKLEN_T_
+#define _BSD_SOCKLEN_T_ int32_t                 /* socklen_t (duh) */
+#endif
+
+/* Settings for handling IP options. There's no netinet/ip_var.h. The IP
+option handling is in the style of the later GLIBCs but the GLIBC macros
+aren't set, so we invent a new one. */
+
+#define NO_IP_VAR_H
+#define DARWIN_IP_OPTIONS
+
+/* Need this for the DNS lookup code. Remember to remove if we get round to
+updating Exim to use the newer interface. */
+
+#define BIND_8_COMPAT
+
+/* It's not .so for dynamic libraries on Darwin. */
+#define DYNLIB_FN_EXT "dylib"
+
+/* We currently need some assistance getting OFF_T_FMT correct on MacOS */
+#ifdef OFF_T_FMT
+# undef OFF_T_FMT
+#endif
+#define OFF_T_FMT "%lld"
+#define LONGLONG_T long int
+
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
+/* End */
diff --git a/src/OS/unsupported/Makefile-Darwin b/src/OS/unsupported/Makefile-Darwin
deleted file mode 100644
index be0d9520b..000000000
--- a/src/OS/unsupported/Makefile-Darwin
+++ /dev/null
@@ -1,29 +0,0 @@
-# Exim: OS-specific make file for Darwin (Mac OS X).
-
-CC=cc
-
-BASENAME_COMMAND=look_for_it
-CHOWN_COMMAND=/usr/sbin/chown
-CHMOD_COMMAND=/bin/chmod
-
-HAVE_SA_LEN=YES
-
-# Removed -DBIND_8_COMPAT for 4.61
-# CFLAGS=-O -no-cpp-precomp -DBIND_8_COMPAT
-
-CFLAGS=-O -no-cpp-precomp
-LIBRESOLV=-lresolv
-
-USE_DB = yes
-DBMLIB =
-
-X11=/usr/X11R6
-XINCLUDE=-I$(X11)/include
-XLFLAGS=-L$(X11)/lib
-X11_LD_LIB=$(X11)/lib
-
-EXIWHAT_PS_ARG=ax
-EXIWHAT_EGREP_ARG='/exim( |$$)'
-EXIWHAT_KILL_SIGNAL=-USR1
-
-# End
diff --git a/src/OS/unsupported/os.h-Darwin b/src/OS/unsupported/os.h-Darwin
deleted file mode 100644
index f4087404e..000000000
--- a/src/OS/unsupported/os.h-Darwin
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Exim: OS-specific C header file for Darwin (Mac OS X) */
-
-/* #define CRYPT_H */  /* Apparently this isn't needed */
-
-#define HAVE_MMAP
-#define HAVE_SYS_MOUNT_H
-#define PAM_H_IN_PAM
-#define SIOCGIFCONF_GIVES_ADDR
-
-/* OSX 10.2 does not have poll.h, 10.3 does emulate it badly. */
-#define NO_POLL_H
-
-#define F_FREESP     O_TRUNC
-typedef struct flock flock_t;
-
-#define BASE_62 36  /* HFS+ aliases lower and upper cases in filenames.
-                               Consider reducing MAX_LOCALHOST_NUMBER */
-
-#ifndef        _BSD_SOCKLEN_T_
-#define _BSD_SOCKLEN_T_ int32_t                 /* socklen_t (duh) */
-#endif
-
-/* Settings for handling IP options. There's no netinet/ip_var.h. The IP
-option handling is in the style of the later GLIBCs but the GLIBC macros
-aren't set, so we invent a new one. */
-
-#define NO_IP_VAR_H
-#define DARWIN_IP_OPTIONS
-
-/* Need this for the DNS lookup code. Remember to remove if we get round to
-updating Exim to use the newer interface. */
-
-#define BIND_8_COMPAT
-
-/* It's not .so for dynamic libraries on Darwin. */
-#define DYNLIB_FN_EXT "dylib"
-
-/* We currently need some assistance getting OFF_T_FMT correct on MacOS */
-#ifdef OFF_T_FMT
-# undef OFF_T_FMT
-#endif
-#define OFF_T_FMT "%lld"
-#define LONGLONG_T long int
-
-/* default is non-const */
-#define ICONV_ARG2_TYPE const char **
-
-/* End */