devel/cmake

This commit is contained in:
Ben Gras 2014-06-30 16:18:03 +00:00 committed by Lionel Sambuc
parent 7aa81ee4fb
commit f188dc0d0a
5 changed files with 48 additions and 12 deletions

View File

@ -34,6 +34,11 @@ LDFLAGS.SunOS+= -lsocket -lnsl
CONFIGURE_ARGS+= --parallel=${MAKE_JOBS:Q}
.endif
.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
post-extract:
${CP} ${FILESDIR}/Minix.cmake ${WRKSRC}/Modules/Platform/
.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
PLIST_SUBST+= CMAKE_API=${CMAKE_API}
# for Source/cmDependsJavaParser.cxx

View File

@ -7,8 +7,9 @@ SHA1 (patch-CMakeLists.txt) = a37825ad9d1704b9cb716a52148c637d26733898
SHA1 (patch-Modules_FindFreetype.cmake) = 7868ab96cadc011ccb16205382a3cbfa3d159f32
SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 7bad025ea21164f8a4b835665bea87166a5c478c
SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 889d2a603ef92b2ecd8b71b16796dce58a788565
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508
SHA1 (patch-ae) = d5c40a3aa39c8b09b3de0cb624b5b5a3be6b5126

View File

@ -0,0 +1,11 @@
SET(CMAKE_DL_LIBS "")
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") # -pic
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") # -shared
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # +s, flag for exe link to use shared lib
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
INCLUDE(Platform/UnixPaths)

View File

@ -1,18 +1,12 @@
$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.7 2014/03/25 07:11:52 asau Exp $
* Add more conditional handling for NetBSD, same as others.
* Treat FreeBSD and DragonFly the same way as NetBSD and OpenBSD.
* Treat Solaris same as Linux.
* Use correct cmake define.
--- Source/kwsys/SystemInformation.cxx.orig 2014-01-16 17:15:08.000000000 +0000
+++ Source/kwsys/SystemInformation.cxx
$NetBSD$
--- Source/kwsys/SystemInformation.cxx.orig Thu Jan 16 17:15:08 2014
+++ Source/kwsys/SystemInformation.cxx Fri Jul 11 06:22:41 2014
@@ -78,9 +78,9 @@ typedef int siginfo_t;
# include <errno.h> // extern int errno;
#endif
-#ifdef __FreeBSD__
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__minix) || defined(__FreeBSD__) || defined(__DragonFly__)
+# include <sys/param.h>
# include <sys/sysctl.h>
-# include <fenv.h>
@ -49,7 +43,19 @@ $NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.7 2014/03/25 07:11:52 asau
# include <fenv.h>
# include <sys/socket.h>
# include <netdb.h>
@@ -4616,7 +4620,7 @@ bool SystemInformationImplementation::Qu
@@ -3679,7 +3683,11 @@
// install ours
struct sigaction sa;
sa.sa_sigaction=(SigAction)StacktraceSignalHandler;
+#if defined(__minix)
+ sa.sa_flags=SA_RESTART|SA_RESETHAND;
+#else
sa.sa_flags=SA_SIGINFO|SA_RESTART|SA_RESETHAND;
+#endif
sigemptyset(&sa.sa_mask);
sigaction(SIGABRT,&sa,0);
@@ -4616,7 +4624,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.

View File

@ -0,0 +1,13 @@
$NetBSD$
--- Source/kwsys/ProcessUNIX.c.orig Wed Nov 3 19:58:30 2010
+++ Source/kwsys/ProcessUNIX.c
@@ -111,7 +111,7 @@ static inline void kwsysProcess_usleep(unsigned int ms
#endif
/* Some platforms do not have siginfo on their signal handlers. */
-#if defined(SA_SIGINFO) && !defined(__BEOS__)
+#if defined(SA_SIGINFO) && !defined(__BEOS__) && !defined(__minix)
# define KWSYSPE_USE_SIGINFO 1
#endif