diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | mingw-cmake-py.sh | 8 | ||||
| -rw-r--r-- | mingw-cmake.sh | 11 | ||||
| -rw-r--r-- | toolchain-mingw.cmake | 1 |
5 files changed, 8 insertions, 31 deletions
@@ -1,7 +1,7 @@ pkgbase = mingw-w64-cmake pkgdesc = CMake wrapper for MinGW (mingw-w64) pkgver = 1 - pkgrel = 33 + pkgrel = 40 url = http://fedoraproject.org/wiki/MinGW arch = any license = GPL @@ -11,11 +11,8 @@ pkgbase = mingw-w64-cmake depends = mingw-w64-environment optdepends = mingw-w64-wine: runtime support source = mingw-cmake.sh - source = mingw-cmake-py.sh source = toolchain-mingw.cmake sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP pkgname = mingw-w64-cmake - @@ -1,7 +1,6 @@ - pkgname=mingw-w64-cmake pkgver=1 -pkgrel=33 +pkgrel=40 arch=('any') pkgdesc="CMake wrapper for MinGW (mingw-w64)" depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-environment') @@ -9,19 +8,15 @@ optdepends=('mingw-w64-wine: runtime support') license=("GPL") url="http://fedoraproject.org/wiki/MinGW" source=("mingw-cmake.sh" - "mingw-cmake-py.sh" "toolchain-mingw.cmake") -sha256sums=('SKIP' 'SKIP' "SKIP") +sha256sums=('SKIP' 'SKIP') + _architectures="i686-w64-mingw32 x86_64-w64-mingw32" -_python_versions="27 36 37 38" build() { for _arch in ${_architectures}; do sed "s|@TRIPLE@|${_arch}|g;s|@PROCESSOR@|${_arch::-12}|g" toolchain-mingw.cmake > toolchain-${_arch}.cmake sed "s|@TRIPLE@|${_arch}|g" mingw-cmake.sh > ${_arch}-cmake - for _pyver in ${_python_versions}; do - sed "s|@TRIPLE@|${_arch}|g;s|@PYMAJMIN@|${_pyver}|g" mingw-cmake-py.sh > ${_arch}-cmake-py${_pyver} - done done } @@ -31,9 +26,6 @@ package() { for _arch in ${_architectures}; do install -m 644 toolchain-${_arch}.cmake "${pkgdir}"/usr/share/mingw/ install -m 755 ${_arch}-cmake "${pkgdir}"/usr/bin/ - for _pyver in ${_python_versions}; do - install -m 755 ${_arch}-cmake-py${_pyver} "${pkgdir}"/usr/bin/ - done done } diff --git a/mingw-cmake-py.sh b/mingw-cmake-py.sh deleted file mode 100644 index 641c9c302b22..000000000000 --- a/mingw-cmake-py.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -mingw_prefix=/usr/@TRIPLE@ - -@TRIPLE@-cmake \ - -DPYTHON_INCLUDE_DIR=${mingw_prefix}/include/python@PYMAJMIN@ \ - -DPYTHON_LIBRARY=${mingw_prefix}/lib/libpython@PYMAJMIN@.dll.a \ - -DPYTHON_EXECUTABLE=/usr/bin/@TRIPLE@-python@PYMAJMIN@-bin \ - "$@" diff --git a/mingw-cmake.sh b/mingw-cmake.sh index 886f0a126ccf..391f7a172fac 100644 --- a/mingw-cmake.sh +++ b/mingw-cmake.sh @@ -1,20 +1,15 @@ -#!/bin/sh +#!/bin/bash -source mingw-env @TRIPLE@ +. /usr/bin/mingw-env @TRIPLE@ mingw_prefix=/usr/@TRIPLE@ -export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig" - PATH=${mingw_prefix}/bin:$PATH cmake \ -DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DINCLUDE_INSTALL_DIR:PATH=${mingw_prefix}/include \ - -DLIB_INSTALL_DIR:PATH=${mingw_prefix}/lib \ - -DSYSCONF_INSTALL_DIR:PATH=${mingw_prefix}/etc \ - -DSHARE_INSTALL_DIR:PATH=${mingw_prefix}/share \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ + -DCMAKE_BUILD_TYPE=None \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \ -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \ diff --git a/toolchain-mingw.cmake b/toolchain-mingw.cmake index 6e0136a9013a..c99b33e55686 100644 --- a/toolchain-mingw.cmake +++ b/toolchain-mingw.cmake @@ -18,6 +18,7 @@ set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) # Make sure Qt can be detected by CMake set (QT_BINARY_DIR /usr/@TRIPLE@/bin /usr/bin) set (QT_INCLUDE_DIRS_NO_SYSTEM ON) +set (QT_HOST_PATH "/usr" CACHE PATH "host path for Qt") # set the resource compiler (RHBZ #652435) set (CMAKE_RC_COMPILER @TRIPLE@-windres) |