[Evolution] Bug#520068: evolution-data-server: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: evolution-data-server
Severity: important
Version: 2.24.5-2
Tags: patch
User: glibc-bsd-devel at lists.alioth.debian.org
Usertags: kfreebsd


Hi,

the current version fails to build on GNU/kFreeBSD.

It needs small tweaks, see bellow.

It would also be nice if you can ask upstream
to include this change.

Thanks in advance

                         Petr


--- calendar/libical/src/libical/icaltz-util.c~
+++ calendar/libical/src/libical/icaltz-util.c
@@ -28,7 +28,7 @@
  #define LITTLE_ENDIAN 'l'
  #define BYTE_ORDER LITTLE_ENDIAN
  #define bswap32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) <<  8) | (((val) & 0x00ff0000U) >>  8) | (((val) & 0xff000000U) >> 24))
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__GLIBC__)
  #include <byteswap.h>
  #include <endian.h>
  #else
@@ -96,7 +96,7 @@
      if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
          return *(const int *) ptr;
      else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
-#ifdef __linux__
+#if defined(__linux__) || defined(__GLIBC__)
          return bswap_32 (*(const int *) ptr);
  #else
           return bswap32 (*(const uint32_t *) ptr);