[115785] trunk/dports/devel/cmake

[nicos at macports.org]

Revision: 115785
          https://trac.macports.org/changeset/115785
Author:   nicos at macports.org
Date:     2014-01-11 02:08:14 -0800 (Sat, 11 Jan 2014)
Log Message:
-----------
cmake: disable internal architecture check within cmake (maintainer timeout, #41835)

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile

Added Paths:
-----------
    trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2014-01-11 07:30:45 UTC (rev 115784)
+++ trunk/dports/devel/cmake/Portfile	2014-01-11 10:08:14 UTC (rev 115785)
@@ -6,7 +6,7 @@
 
 name                cmake
 version             2.8.12
-revision            2
+revision            3
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             BSD
@@ -28,7 +28,8 @@
 
 patchfiles          patch-CMakeFindFrameworks.cmake.diff \
                     patch-Modules-FindFreetype.cmake.diff \
-                    patch-Modules-FindQt4.cmake.diff
+                    patch-Modules-FindQt4.cmake.diff \
+                    patch-Modules-noArchCheck.diff
 
 configure.env-append \
                     CMAKE_PREFIX_PATH=${prefix} \

Added: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff	                        (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff	2014-01-11 10:08:14 UTC (rev 115785)
@@ -0,0 +1,59 @@
+diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+--- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in	2013-10-08 00:31:00.000000000 +0900
++++ ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in	2013-12-25 16:14:04.000000000 +0900
+@@ -17,15 +17,3 @@
+     set(PACKAGE_VERSION_EXACT TRUE)
+   endif()
+ endif()
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+-   return()
+-endif()
+-
+-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+-if(NOT "${CMAKE_SIZEOF_VOID_P}"  STREQUAL  "@CMAKE_SIZEOF_VOID_P@")
+-   math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
+-   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+-   set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
+diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in ./Modules/BasicConfigVersion-ExactVersion.cmake.in
+--- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in	2013-10-08 00:31:00.000000000 +0900
++++ ./Modules/BasicConfigVersion-ExactVersion.cmake.in	2013-12-25 16:14:00.000000000 +0900
+@@ -32,16 +32,3 @@
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+   set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+-
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+-   return()
+-endif()
+-
+-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+-if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
+-  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
+-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
+diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+--- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in	2013-10-08 00:31:00.000000000 +0900
++++ ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in	2013-12-25 16:13:52.000000000 +0900
+@@ -31,16 +31,3 @@
+       set(PACKAGE_VERSION_EXACT TRUE)
+   endif()
+ endif()
+-
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+-   return()
+-endif()
+-
+-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+-if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
+-  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
+-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140111/552f1fa9/attachment.html>