[MacPorts] #30504: Update cmake to 2.8.5
#30504: Update cmake to 2.8.5 ------------------------------+--------------------------------------------- Reporter: css@… | Owner: css@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: 1.9.2 Keywords: | Port: cmake ------------------------------+--------------------------------------------- The [http://www.kitware.com/news/home/browse/344 new version of cmake] is available, but 2.8.5 makes some changes to the Qt module that conflicts with included patches. {{{ ---> Applying /Users/Shared/macports/dports/devel/cmake/files/patch- Modules-FindQt4.cmake.diff patching file Modules/FindQt4.cmake Hunk #1 succeeded at 526 (offset -57 lines). Hunk #2 FAILED at 551. Hunk #3 succeeded at 622 with fuzz 2 (offset -45 lines). Hunk #4 succeeded at 675 (offset -41 lines). Hunk #5 succeeded at 696 (offset -41 lines). 1 out of 5 hunks FAILED -- saving rejects to file Modules/FindQt4.cmake.rej shell command " cd "/opt/local/var/macports/build/_Users_Shared_macports_dports_devel_cmake/work/cmake-2.8.5" && /usr/bin/patch -p0 < '/Users/Shared/macports/dports/devel/cmake/files /patch-Modules-FindQt4.cmake.diff'" returned error 1 Error: Target org.macports.patch returned: shell command failed (see log for details) }}} -- Ticket URL: <https://trac.macports.org/ticket/30504> MacPorts <http://www.macports.org/> Ports system for Mac OS
#30504: Update cmake to 2.8.5 ------------------------------+--------------------------------------------- Reporter: css@… | Owner: css@… Type: update | Status: assigned Priority: Normal | Milestone: Component: ports | Version: 1.9.2 Keywords: | Port: cmake ------------------------------+--------------------------------------------- Changes (by css@…): * status: new => assigned Comment: It looks like `QT_QTCORE_LIBRARY_RELEASE` and `QT_QTCORE_LIBRARY_DEBUG` have `NO_DEFAULT_PATH` set now. I removed that hunk from the patch, and it patches properly now. -- Ticket URL: <https://trac.macports.org/ticket/30504#comment:1> MacPorts <http://www.macports.org/> Ports system for Mac OS
#30504: Update cmake to 2.8.5 -------------------------------+-------------------------------------------- Reporter: css@… | Owner: css@… Type: update | Status: closed Priority: Normal | Milestone: Component: ports | Version: 1.9.2 Resolution: fixed | Keywords: Port: cmake | -------------------------------+-------------------------------------------- Changes (by css@…): * status: assigned => closed * resolution: => fixed Comment: Committed to r81498 -- Ticket URL: <https://trac.macports.org/ticket/30504#comment:2> MacPorts <http://www.macports.org/> Ports system for Mac OS
participants (1)
-
MacPorts