From 6f25e30c5d0df5fdef4203e572ca11dd5f8d3210 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Mon, 30 Jun 2014 16:18:03 +0000 Subject: [PATCH] Step 2: base dep: devel/cmake --- devel/cmake/Makefile | 7 +++++++ devel/cmake/PLIST | 1 + devel/cmake/distinfo | 2 ++ devel/cmake/files/Minix.cmake | 11 +++++++++++ devel/cmake/patches/patch-zz-minix-a | 23 +++++++++++++++++++++++ devel/cmake/patches/patch-zz-minix-b | 13 +++++++++++++ 6 files changed, 57 insertions(+) create mode 100644 devel/cmake/files/Minix.cmake create mode 100644 devel/cmake/patches/patch-zz-minix-a create mode 100644 devel/cmake/patches/patch-zz-minix-b diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index febea535b..14181f58a 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -34,6 +34,13 @@ LDFLAGS.SunOS+= -lsocket -lnsl CONFIGURE_ARGS+= --parallel=${MAKE_JOBS:Q} .endif +.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" +LDFLAGS+= -lbz2 -llzma + +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 diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST index b9294c27a..b84beabd4 100644 --- a/devel/cmake/PLIST +++ b/devel/cmake/PLIST @@ -1727,6 +1727,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/Linux-XL-CXX.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-XL-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux-como.cmake share/cmake-${CMAKE_API}/Modules/Platform/Linux.cmake +share/cmake-${CMAKE_API}/Modules/Platform/Minix.cmake share/cmake-${CMAKE_API}/Modules/Platform/MP-RAS.cmake share/cmake-${CMAKE_API}/Modules/Platform/MirBSD.cmake share/cmake-${CMAKE_API}/Modules/Platform/NetBSD.cmake diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index b82d31578..82543b18c 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -19,3 +19,5 @@ SHA1 (patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp) = 52c4cb0e8f097a SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 +SHA1 (patch-zz-minix-a) = 7d1fa8e45289e9c1ea3b8ad330c2093a83985e8d +SHA1 (patch-zz-minix-b) = d5c40a3aa39c8b09b3de0cb624b5b5a3be6b5126 diff --git a/devel/cmake/files/Minix.cmake b/devel/cmake/files/Minix.cmake new file mode 100644 index 000000000..bc819956e --- /dev/null +++ b/devel/cmake/files/Minix.cmake @@ -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) diff --git a/devel/cmake/patches/patch-zz-minix-a b/devel/cmake/patches/patch-zz-minix-a new file mode 100644 index 000000000..a827b7495 --- /dev/null +++ b/devel/cmake/patches/patch-zz-minix-a @@ -0,0 +1,23 @@ +--- Source/kwsys/SystemInformation.cxx.orig Thu Apr 23 08:25:23 2015 ++++ Source/kwsys/SystemInformation.cxx Thu Apr 23 08:25:29 2015 +@@ -81,7 +81,7 @@ + # include // extern int errno; + #endif + +-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) ++#if defined(__OpenBSD__) || defined(__minix) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) + # include + # include + # include +@@ -3703,7 +3703,11 @@ + // install ours + struct sigaction sa; + sa.sa_sigaction=(SigAction)StacktraceSignalHandler; ++# if defined(__minix) ++ sa.sa_flags=SA_RESETHAND; ++# else + sa.sa_flags=SA_SIGINFO|SA_RESETHAND; ++# endif /* defined(__minix) */ + # ifdef SA_RESTART + sa.sa_flags|=SA_RESTART; + # endif diff --git a/devel/cmake/patches/patch-zz-minix-b b/devel/cmake/patches/patch-zz-minix-b new file mode 100644 index 000000000..362ffd0bc --- /dev/null +++ b/devel/cmake/patches/patch-zz-minix-b @@ -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 +