diff options
| author | obache <obache@pkgsrc.org> | 2013-10-25 10:49:23 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2013-10-25 10:49:23 +0000 |
| commit | b3018a04a8659d6cba14ee82c7181f04ccda159d (patch) | |
| tree | daef9d12b0c4f119cb3675a4b5381707b9181035 /devel/cmake | |
| parent | ae4a0a3cd35f42c1e053693c1ff90251768294d6 (diff) | |
| download | pkgsrc-b3018a04a8659d6cba14ee82c7181f04ccda159d.tar.gz | |
Add conditions for NetBSD, especially fixes build on NetBSD-current.
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/distinfo | 4 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx | 33 |
2 files changed, 31 insertions, 6 deletions
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 624183479d7..e3719fe7880 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.52 2013/10/24 04:50:57 obache Exp $ +$NetBSD: distinfo,v 1.53 2013/10/25 10:49:23 obache Exp $ SHA1 (cmake-2.8.12.tar.gz) = 93c93d556e702f8c967acf139fd716268ce69f39 RMD160 (cmake-2.8.12.tar.gz) = cf9853a662806747a3a2b4615df6dea6f7001632 @@ -6,7 +6,7 @@ Size (cmake-2.8.12.tar.gz) = 6064138 bytes SHA1 (patch-CMakeLists.txt) = a37825ad9d1704b9cb716a52148c637d26733898 SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 -SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 760266029d4264b3fa7d1d6105cae799768bdb41 +SHA1 (patch-Source_kwsys_SystemInformation.cxx) = ee7f56c0f9c4c096e8b7488c7f34cb32ae02a047 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502 diff --git a/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx b/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx index d1f28b6c66b..4498797b907 100644 --- a/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx +++ b/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx @@ -1,10 +1,35 @@ -$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.4 2013/10/24 04:50:57 obache Exp $ +$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.5 2013/10/25 10:49:23 obache Exp $ -Use correct cmake define. +* Add more conditional handling for NetBSD, same as others. +* Treat Solaris same as Linux. +* Use correct cmake define. --- Source/kwsys/SystemInformation.cxx.orig 2013-10-07 15:31:00.000000000 +0000 +++ Source/kwsys/SystemInformation.cxx -@@ -130,7 +130,7 @@ typedef int siginfo_t; +@@ -93,6 +93,22 @@ typedef int siginfo_t; + #if defined(__OpenBSD__) || defined(__NetBSD__) + # include <sys/param.h> + # include <sys/sysctl.h> ++# include <sys/socket.h> ++# include <netdb.h> ++# include <netinet/in.h> ++# if defined(KWSYS_SYS_HAS_IFADDRS_H) ++# include <ifaddrs.h> ++# define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN ++# endif ++# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE) ++# include <execinfo.h> ++# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE) ++# include <cxxabi.h> ++# endif ++# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP) ++# include <dlfcn.h> ++# endif ++# endif + #endif + + #if defined(KWSYS_SYS_HAS_MACHINE_CPU_H) +@@ -130,7 +146,7 @@ typedef int siginfo_t; # endif #endif @@ -13,7 +38,7 @@ Use correct cmake define. # include <fenv.h> # include <sys/socket.h> # include <netdb.h> -@@ -4616,7 +4616,7 @@ bool SystemInformationImplementation::Qu +@@ -4616,7 +4632,7 @@ bool SystemInformationImplementation::Qu // a 32 bit process on a 64 bit host the returned memory will be // limited to 4GiB. So if this is a 32 bit process or if the sysconf // method fails use the kstat interface. |