Ticket #36857: patch-devel-cmake-2.8.10.diff
File patch-devel-cmake-2.8.10.diff, 6.6 KB (added by pixilla (Bradley Giesbrecht), 12 years ago) |
---|
-
devel/cmake/Portfile
5 5 PortGroup muniversal 1.0 6 6 7 7 name cmake 8 version 2.8.9 9 revision 1 8 version 2.8.10 10 9 set branch [join [lrange [split ${version} .] 0 1] .] 11 10 categories devel 12 11 license BSD … … 22 21 master_sites http://www.cmake.org/files/v${branch}/ 23 22 platforms darwin freebsd 24 23 25 checksums md5 801f4c87f8b604f727df5bf1f05a59e7 \ 26 sha1 b96663c0757a5edfbddc410aabf7126a92131e2b \ 27 rmd160 66808a280eb8e4ae798df3283fab8bcc3f512777 24 checksums rmd160 9af9e3f26f0f3d827ef566f99050fe6a2721dd25 \ 25 sha256 a18b721c547c2ce2ea9378f2687caca4398fc348982ede799e96b26924cc9e04 28 26 29 27 depends_lib-append port:libidn port:openssl 30 28 … … 52 50 patchfiles patch-CMakeFindFrameworks.cmake.diff \ 53 51 patch-Modules-FindQt4.cmake.diff 54 52 53 # Add upstream patch for Darwin.cmake 54 patchfiles-append patch-Modules-Platform-Darwin.cmake.diff 55 55 56 post-patch { 56 57 # copy cmake init file, ready to be patched below 57 58 copy ${filespath}/macports.cmake ${worksrcpath} -
devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
1 --- Modules/CMakeFindFrameworks.cmake 2012- 05-11 11:39:53.000000000 +02002 +++ Modules/CMakeFindFrameworks.cmake 2012- 05-11 11:47:07.000000000 +02001 --- Modules/CMakeFindFrameworks.cmake 2012-11-02 10:05:18.000000000 -0700 2 +++ Modules/CMakeFindFrameworks.cmake 2012-11-02 10:12:23.000000000 -0700 3 3 @@ -20,6 +20,7 @@ 4 IF(APPLE)5 FOREACH(dir4 if(APPLE) 5 foreach(dir 6 6 ~/Library/Frameworks/${fwk}.framework 7 7 + __PREFIX__/Library/Frameworks/${fwk}.framework 8 8 /Library/Frameworks/${fwk}.framework -
devel/cmake/files/patch-Modules-FindQt4.cmake.diff
1 --- Modules/FindQt4.cmake 2012- 05-11 11:39:53.000000000 +02002 +++ Modules/FindQt4.cmake 2012- 05-11 11:49:04.000000000 +02003 @@ -5 26,7 +526,8 @@4 SET(QT_MKSPECS_DIR NOTFOUND)5 FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri1 --- Modules/FindQt4.cmake 2012-11-02 10:05:18.000000000 -0700 2 +++ Modules/FindQt4.cmake 2012-11-02 10:08:45.000000000 -0700 3 @@ -550,7 +550,8 @@ 4 set(QT_MKSPECS_DIR NOTFOUND) 5 find_path(QT_MKSPECS_DIR NAMES qconfig.pri 6 6 HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} 7 7 - DOC "The location of the Qt mkspecs containing qconfig.pri") 8 8 + DOC "The location of the Qt mkspecs containing qconfig.pri" 9 9 + NO_DEFAULT_PATH) 10 ENDIF()10 endif() 11 11 12 IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")13 @@ -6 20,6 +621,7 @@14 FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore12 if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") 13 @@ -644,6 +645,7 @@ 14 find_path(QT_QTCORE_INCLUDE_DIR QtCore 15 15 HINTS ${qt_headers} ${QT_LIBRARY_DIR} 16 16 PATH_SUFFIXES QtCore qt4/QtCore 17 17 + NO_DEFAULT_PATH 18 18 ) 19 19 20 20 # Set QT_HEADERS_DIR based on finding QtCore header 21 @@ -6 72,7 +674,8 @@22 endforeach( qt_cross_path)23 FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer21 @@ -696,7 +698,8 @@ 22 endforeach() 23 find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer 24 24 HINTS ${qt_cross_paths} ${qt_plugins_dir} 25 25 - DOC "The location of the Qt plugins") 26 26 + DOC "The location of the Qt plugins" 27 27 + NO_DEFAULT_PATH) 28 ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)28 endif () 29 29 30 30 # ask qmake for the translations directory 31 @@ - 692,8 +695,7 @@32 FIND_PATH(QT_IMPORTS_DIR NAMES Qt31 @@ -716,8 +719,7 @@ 32 find_path(QT_IMPORTS_DIR NAMES Qt 33 33 HINTS ${qt_cross_paths} ${qt_imports_dir} 34 34 DOC "The location of the Qt imports" 35 35 - NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH 36 36 - NO_CMAKE_SYSTEM_PATH) 37 37 + NO_DEFAULT_PATH) 38 38 mark_as_advanced(QT_IMPORTS_DIR) 39 endif( qt_imports_dir)40 ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)39 endif() 40 endif () -
devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff
1 From: Brad King <brad.king@kitware.com> 2 Date: Mon, 5 Nov 2012 15:43:46 +0000 (-0500) 3 Subject: OS X: Fix default CMAKE_OSX_SYSROOT with deployment target 4 X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=15f5764e 5 6 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target 7 8 Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT 9 selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when 10 one is needed. However, the change forgot that we require a sysroot 11 when a deployment target is requested. Teach Darwin.cmake to choose a 12 default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. 13 14 Reported-by: Matthew Brett <matthew.brett@gmail.com> 15 Reported-by: Bradley Giesbrecht <pixilla@macports.org> 16 --- 17 18 diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake 19 index a401762..4e7e99c 100644 20 --- Modules/Platform/Darwin.cmake 21 +++ Modules/Platform/Darwin.cmake 22 @@ -107,6 +107,7 @@ elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND 23 # Use the value of SDKROOT from the environment. 24 set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}") 25 elseif("${CMAKE_GENERATOR}" MATCHES Xcode 26 + OR CMAKE_OSX_DEPLOYMENT_TARGET 27 OR CMAKE_OSX_ARCHITECTURES MATCHES "[^;]" 28 OR NOT EXISTS "/usr/include/sys/types.h") 29 # Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs directory. -
_resources/port1.0/group/cmake-1.0.tcl
64 64 -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\" 65 65 if {${configure.sdkroot} != ""} { 66 66 configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}" 67 } else {68 configure.args-append -DCMAKE_OSX_SYSROOT=/69 67 } 70 68 } 71 69