Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

cmake: Do not use response files for MSYS generator.

Browse Source
This commit is contained in:
Alexpux
2014-01-31 01:00:10 +04:00
parent f5bcb1fae2
commit b72d2cd220
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mingw-w64-cmake/PKGBUILD
View File

@@ -4,13 +4,13 @@ _realname=cmake
_mingw_suff=mingw-w64-${CARCH}
pkgname="${_mingw_suff}-${_realname}"
pkgver=2.8.12.2
pkgrel=1
pkgrel=2
pkgdesc="A cross-platform open-source make system (mingw-w64)."
arch=('any')
url="http://www.cmake.org/"
license=("MIT")
makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config")
depends=("${_mingw_suff}-winpthreads"
depends=("${_mingw_suff}-gcc-libs"
"${_mingw_suff}-curl"
"${_mingw_suff}-expat"
"${_mingw_suff}-libarchive"
@@ -19,13 +19,16 @@ depends=("${_mingw_suff}-winpthreads"
"${_mingw_suff}-zlib")
options=('staticlibs' 'strip')
source=("http://www.cmake.org/files/v2.8/${_realname}-${pkgver}.tar.gz"
"findfreetype.patch")
"findfreetype.patch"
"disable-response-files-for-msys.patch")
md5sums=('17c6513483d23590cbce6957ec6d1e66'
'90321de1d9d46cd8d6609d0509dbd7b0')
'90321de1d9d46cd8d6609d0509dbd7b0'
'9cb83b715a68f03f9db8c2eebc127f80')
prepare() {
cd ${_realname}-${pkgver}
patch -Np1 < ${srcdir}/findfreetype.patch
cd ${_realname}-${pkgver}
patch -Np1 -i ${srcdir}/findfreetype.patch
patch -Np1 -i ${srcdir}/disable-response-files-for-msys.patch
}
build() {

15
mingw-w64-cmake/disable-response-files-for-msys.patch Normal file
View File

@@ -0,0 +1,15 @@
--- cmake-2.8.12.2/Modules/Platform/Windows-GNU.cmake.orig 2014-01-30 23:55:26.783200000 +0400
+++ cmake-2.8.12.2/Modules/Platform/Windows-GNU.cmake 2014-01-31 00:03:27.411200000 +0400
@@ -86,8 +86,10 @@
set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "")
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "")
- set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
- set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+ if(NOT CMAKE_GENERATOR STREQUAL "MSYS Makefiles")
+ set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
+ set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+ endif()
# We prefer "@" for response files but it is not supported by gcc 3.
execute_process(COMMAND ${CMAKE_${lang}_COMPILER} --version OUTPUT_VARIABLE _ver ERROR_VARIABLE _ver)