From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 12 Mar 2017 02:01:00 +0000 (-0500)
Subject: uClibc does not contain gnu/libc-version.h
X-Git-Tag: exim-4_90_RC1~222
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/98913c8ea2be5188dd22ec652da1182017e8edb7

uClibc does not contain gnu/libc-version.h

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 0baa1dc67..5b5dcbd7f 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -30,6 +30,10 @@ JH/04 Shorten the log line for daemon startup by collapsing adjacent sets of
       identical IP addresses on different listening ports.  Will also affect
       "exiwhat" output.
 
+PP/02 Bug 2070: uClibc defines __GLIBC__ without providing glibc headers;
+      add noisy ifdef guards to special-case this sillyness.
+      Patch from Bernd Kuhls.
+
 
 Exim version 4.89
 -----------------
diff --git a/src/src/exim.c b/src/src/exim.c
index ee7bfcd22..fd08cc780 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -12,7 +12,7 @@ Also a few functions that don't naturally fit elsewhere. */
 
 #include "exim.h"
 
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
 # include <gnu/libc-version.h>
 #endif
 
@@ -1044,7 +1044,7 @@ DEBUG(D_any) do {
   fprintf(f, "Compiler: <unknown>\n");
 #endif
 
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
   fprintf(f, "Library version: Glibc: Compile: %d.%d\n",
 	       	__GLIBC__, __GLIBC_MINOR__);
   if (__GLIBC_PREREQ(2, 1))