[patch] cmake patch for FreeMiNT

cmake-2.8.11.1-mint.patch (text/plain), 4.55 KB, created by Alan Hourihane on 2014-02-24 16:06:38 UTC

--- /dev/null	2013-09-23 00:41:24.000000000 +0000
+++ Modules/Platform/FreeMiNT.cmake	2013-10-02 11:50:48.000000000 +0000
@@ -0,0 +1,16 @@
+INCLUDE(Platform/UnixPaths)
+
+set(CMAKE_C_COMPILE_OPTIONS_PIC "")
+set(CMAKE_CXX_COMPILE_OPTIONS_PIC "")
+set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
+set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostdlib -Wl,-r")
+set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-nostdlib -Wl,-r")
+set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+set(CMAKE_CXX_LINK_SHARED_LIBRARY )
+set(CMAKE_CXX_LINK_MODULE_LIBRARY )
+set(CMAKE_C_LINK_SHARED_LIBRARY )
+set(CMAKE_C_LINK_MODULE_LIBRARY )
+set(CMAKE_DL_LIBS "dld" )
+set(CMAKE_SHARED_LIBRARY_PREFIX "lib")    
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".a")           # .a
--- Modules/FindCURL.cmake.orig	2013-09-29 20:08:13.000000000 +0000
+++ Modules/FindCURL.cmake	2013-09-29 20:09:45.000000000 +0000
@@ -56,6 +56,6 @@
                                   VERSION_VAR CURL_VERSION_STRING)
 
 if(CURL_FOUND)
-  set(CURL_LIBRARIES ${CURL_LIBRARY})
+  set(CURL_LIBRARIES ${CURL_LIBRARY} ssl crypto)
   set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
 endif()
diff -u Modules/FindLibArchive.cmake.old Modules//FindLibArchive.cmake
--- Modules/FindLibArchive.cmake.old	2011-07-08 12:21:44.000000000 +0000
+++ Modules//FindLibArchive.cmake	2011-10-04 07:36:42.000000000 +0000
@@ -62,5 +62,5 @@
 
 if(LibArchive_FOUND)
   set(LibArchive_INCLUDE_DIRS ${LibArchive_INCLUDE_DIR})
-  set(LibArchive_LIBRARIES    ${LibArchive_LIBRARY})
+  set(LibArchive_LIBRARIES    ${LibArchive_LIBRARY} bz2 lzma xml2 z ssl crypto)
 endif()
--- Source/cmakemain.cxx.old	2013-01-24 14:00:52.000000000 +0000
+++ Source/cmakemain.cxx	2013-01-24 14:02:02.000000000 +0000
@@ -326,6 +326,11 @@
   std::cout.flush();
 }
 
+#if defined (atarist)
+/* The Atari operating system doesn't have a dynamic stack.  The
+   stack size is determined from this value.  */
+long _stksize = 256 * 1024;
+#endif
 
 int main(int ac, char** av)
 {
--- Source/ctest.cxx.old	2013-10-03 17:09:50.000000000 +0000
+++ Source/ctest.cxx	2013-10-03 17:10:22.000000000 +0000
@@ -261,6 +261,12 @@
   {0, 0, 0}
 };
 
+#if defined (atarist)
+/* The Atari operating system doesn't have a dynamic stack.  The
+   stack size is determined from this value.  */
+long _stksize = 256 * 1024;
+#endif
+
 // this is a test driver program for cmCTest.
 int main (int argc, char *argv[])
 {
diff -u Source/kwsys/DynamicLoader.cxx Source/kwsys/DynamicLoader.cxx
--- Source/kwsys/DynamicLoader.cxx	2013-06-07 16:21:34.000000000 +0000
+++ Source/kwsys/DynamicLoader.cxx	2013-10-02 11:10:32.000000000 +0000
@@ -445,15 +445,24 @@
   char *name = (char *)calloc(1, strlen(libname) + 1);
   dld_init(program_invocation_name);
   strncpy(name, libname, strlen(libname));
-  dld_link(libname);
+  if (dld_link(libname)) {
+    free(name);
+    return NULL;
+  }
   return (void *)name;
 }
 
 //----------------------------------------------------------------------------
 int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
 {
-  dld_unlink_by_file((char *)lib, 0);
-  free(lib);
+  if (lib) {
+    int error = dld_unlink_by_file((char *)lib, 0);
+
+    free(lib);
+    
+    if (!error)
+      return 1;
+  }
   return 0;
 }
 
diff -u Source/kwsys/SystemInformation.cxx Source/kwsys/SystemInformation.cxx
--- Source/kwsys/SystemInformation.cxx	2013-06-07 16:21:34.000000000 +0000
+++ Source/kwsys/SystemInformation.cxx	2013-09-30 10:15:21.000000000 +0000
@@ -60,9 +60,6 @@
 # if defined(KWSYS_SYS_HAS_PSAPI)
 #  include <psapi.h>
 # endif
-# if !defined(siginfo_t)
-typedef int siginfo_t;
-# endif
 #else
 # include <sys/types.h>
 # include <sys/time.h>
@@ -208,6 +205,10 @@
 # define USE_CPUID 0
 #endif
 
+#if !defined(siginfo_t)
+typedef int siginfo_t;
+#endif
+
 #if USE_CPUID
 
 #define CPUID_AWARE_COMPILER
@@ -1037,7 +1038,7 @@
 #endif
 
 // ****************************************************************************
-#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__MINT__)
 void StacktraceSignalHandler(
       int sigNo,
       siginfo_t *sigInfo,
@@ -3340,7 +3341,7 @@
 */
 void SystemInformationImplementation::SetStackTraceOnError(int enable)
 {
-#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__MINT__)
   static int saOrigValid=0;
   static struct sigaction saSEGVOrig;
   static struct sigaction saTERMOrig;