01/01: gnu: opencascade-oce: Fix build with glibc 2.26.

[Leo Famulari]

lfam pushed a commit to branch core-updates
in repository guix.

commit a4f393b71f1bdd4d532d629a370e13cae81d06af
Author: Leo Famulari <address@hidden>
Date:   Tue Jan 16 15:20:43 2018 -0800

    gnu: opencascade-oce: Fix build with glibc 2.26.
    
    * gnu/packages/patches/opencascade-oce-glibc-2.26.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/maths.scm (opencascade-oce)[source]: Use it.
---
 gnu/local.mk                                       |  3 +-
 gnu/packages/maths.scm                             |  1 +
 .../patches/opencascade-oce-glibc-2.26.patch       | 62 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index a13b918..a0e761b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -919,11 +919,12 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/ocaml-graph-honor-source-date-epoch.patch       \
   %D%/packages/patches/omake-fix-non-determinism.patch \
   %D%/packages/patches/ola-readdir-r.patch                     \
-  %D%/packages/patches/openscenegraph-ffmpeg3.patch             \
+  %D%/packages/patches/opencascade-oce-glibc-2.26.patch                \
   %D%/packages/patches/openexr-missing-samples.patch           \
   %D%/packages/patches/openfoam-4.1-cleanup.patch                      \
   %D%/packages/patches/openldap-CVE-2017-9287.patch            \
   %D%/packages/patches/openocd-nrf52.patch                     \
+  %D%/packages/patches/openscenegraph-ffmpeg3.patch             \
   %D%/packages/patches/openssl-runpath.patch                   \
   %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch         \
   %D%/packages/patches/openssl-c-rehash-in.patch               \
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 02c0e69..11d336a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1355,6 +1355,7 @@ script files.")
                "https://github.com/tpaviot/oce/archive/OCE-";
                version
                ".tar.gz"))
+        (patches (search-patches "opencascade-oce-glibc-2.26.patch"))
         (sha256
           (base32
             "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"))))
diff --git a/gnu/packages/patches/opencascade-oce-glibc-2.26.patch 
b/gnu/packages/patches/opencascade-oce-glibc-2.26.patch
new file mode 100644
index 0000000..ee5ed57
--- /dev/null
+++ b/gnu/packages/patches/opencascade-oce-glibc-2.26.patch
@@ -0,0 +1,62 @@
+Fix build with glibc 2.26:
+
+https://github.com/tpaviot/oce/issues/675
+
+Patch copied from upstream source repository:
+
+https://github.com/tpaviot/oce/commit/aa1321e68cc004e3debe38d79ae74581a617c767
+
+From aa1321e68cc004e3debe38d79ae74581a617c767 Mon Sep 17 00:00:00 2001
+From: Janus Weil <address@hidden>
+Date: Mon, 18 Dec 2017 11:27:55 +0100
+Subject: [PATCH] fix build errors with glibc 2.26+ due to missing xlocale.h
+ (issue #675)
+
+* check for the presence of xlocale.h via cmake
+* remove related logic from Standard_CLocaleSentry.hxx
+---
+ CMakeLists.txt                          |  1 +
+ src/Standard/Standard_CLocaleSentry.hxx | 15 ---------------
+ 2 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b782b4101..50e9500b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -616,6 +616,7 @@ if (NOT WIN32)
+       # compilation anywhere in OCE
+       include(CheckIncludeFile)
+       check_include_file(strings.h HAVE_STRINGS_H)
++      check_include_file(xlocale.h HAVE_XLOCALE_H)
+       include(CheckIncludeFileCXX)
+       check_include_file_cxx(mm_malloc.h HAVE_MM_MALLOC_H)
+       check_include_file_cxx(atomic.h OCE_HAVE_ATOMIC_H)
+diff --git a/src/Standard/Standard_CLocaleSentry.hxx 
b/src/Standard/Standard_CLocaleSentry.hxx
+index 2b226e7f3..1a4c1dadc 100644
+--- a/src/Standard/Standard_CLocaleSentry.hxx
++++ b/src/Standard/Standard_CLocaleSentry.hxx
+@@ -20,21 +20,6 @@
+ 
+ #include <locale.h>
+ 
+-#ifndef HAVE_XLOCALE_H
+-  //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as 
an extension
+-  //! and become part of POSIX since '2008.
+-  //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L)
+-  //! since POSIX didn't declared such identifier.
+-  #if defined(__APPLE__)
+-    #define HAVE_XLOCALE_H
+-  #endif
+-
+-  //! We check _GNU_SOURCE for glibc extensions here and it is always defined 
by g++ compiler.
+-  #if defined(_GNU_SOURCE) && !defined(__ANDROID__)
+-    #define HAVE_XLOCALE_H
+-  #endif
+-#endif // ifndef HAVE_LOCALE_H
+-
+ #ifdef HAVE_XLOCALE_H
+   #include <xlocale.h>
+ #endif
+-- 
+2.15.1
+