ca75aed246
* Add myself to Uploaders. * Build-Depend on liblzma-dev and libjsoncpp-dev. * Drop patches merged upstream: - fix-FindImageMagick-1.diff - fix-FindImageMagick-2.diff - FindJNI_ppc64le.diff - hurd_host_system_processor.diff * Refresh patches: - FindBoost_add_-lpthread_#563479.diff - FindJNI.cmake.mips.patch - fix-ftbfs-on-kfreebsd.patch - fix-hdf5-hl.patch - qt_import_dir_variable.diff * Bump Standards-Version to 3.9.6. * Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch (Closes: #760298)
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Modestas Vainius <modax@debian.org>
|
|
Subject: Fix FTBFS on GNU/kFreeBSD (and likely Gnu/Hurd)
|
|
Forwarded: yes
|
|
Origin: vendor
|
|
|
|
The original failure [1] was caused by the fact that cxxabi.h execinfo.h etc.
|
|
includes where guarded more restrictively (e.g. additionally by __linux) than
|
|
the code which needs them (just by e.g.
|
|
KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE). kFreeGNU has some of these headers
|
|
hence extend __linux ifdef to kFreeBSD and GNU Hurd as well.
|
|
|
|
Ideally, the code should be fixed to have the same level of ifdef protection in
|
|
all places.
|
|
|
|
[1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=kfreebsd-amd64&ver=2.8.12-1&stamp=1383507045
|
|
|
|
Index: cmake/Source/kwsys/SystemInformation.cxx
|
|
===================================================================
|
|
--- cmake.orig/Source/kwsys/SystemInformation.cxx
|
|
+++ cmake/Source/kwsys/SystemInformation.cxx
|
|
@@ -125,7 +125,7 @@ typedef int siginfo_t;
|
|
# endif
|
|
#endif
|
|
|
|
-#ifdef __linux
|
|
+#if defined(__linux__) || defined(__GLIBC__) || defined(__GNU__)
|
|
# include <fenv.h>
|
|
# include <sys/socket.h>
|
|
# include <netdb.h>
|