rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use relative paths in cmake/meson toolchain files to make ccache work if available

Browse Source
This commit is contained in:
Sandro Mani 2021-11-17 18:30:23 +01:00
parent 91f2255bd3
commit 5788afad0b
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mingw-filesystem.spec
View File

@ -6,7 +6,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem
Version: 123
Version: 124
Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment
@ -351,6 +351,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
%changelog
* Wed Nov 17 2021 Sandro Mani <manisandro@gmail.com> - 124-1
- Use relative paths in cmake/meson toolchain files to make ccache work if
available
* Tue Sep 21 2021 Sandro Mani <manisandro@gmail.com> - 123-1
- Autogenerate mingw-python3 BR
- Fix mingw{32/64}.attr to also capture pyd, pc files

6
toolchain-mingw32.cmake
View File

@ -2,8 +2,8 @@ SET(CMAKE_SYSTEM_NAME Windows)
SET(CMAKE_SYSTEM_PROCESSOR x86)
# specify the cross compiler
SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
# where is the target environment
SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32/sys-root/mingw)
@ -21,7 +21,7 @@ SET(QT_BINARY_DIR /usr/i686-w64-mingw32/bin /usr/bin)
SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
# These are needed for compiling lapack (RHBZ #753906)
SET(CMAKE_Fortran_COMPILER /usr/bin/i686-w64-mingw32-gfortran)
SET(CMAKE_Fortran_COMPILER i686-w64-mingw32-gfortran)
SET(CMAKE_AR:FILEPATH /usr/bin/i686-w64-mingw32-ar)
SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-w64-mingw32-ranlib)

6
toolchain-mingw32.meson
View File

@ -1,7 +1,7 @@
[binaries]
c = '/usr/bin/i686-w64-mingw32-gcc'
cpp = '/usr/bin/i686-w64-mingw32-g++'
fortran = '/usr/bin/i686-w64-mingw32-gfortran'
c = 'i686-w64-mingw32-gcc'
cpp = 'i686-w64-mingw32-g++'
fortran = 'i686-w64-mingw32-gfortran'
rust = ['rustc', '--target', 'i686-pc-windows-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc']
ar = '/usr/bin/i686-w64-mingw32-ar'
pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'

6
toolchain-mingw64.cmake
View File

@ -2,8 +2,8 @@ SET(CMAKE_SYSTEM_NAME Windows)
SET(CMAKE_SYSTEM_PROCESSOR x86_64)
# specify the cross compiler
SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
# where is the target environment
SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32/sys-root/mingw)
@ -21,7 +21,7 @@ SET(QT_BINARY_DIR /usr/x86_64-w64-mingw32/bin /usr/bin)
SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
# These are needed for compiling lapack (RHBZ #753906)
SET(CMAKE_Fortran_COMPILER /usr/bin/x86_64-w64-mingw32-gfortran)
SET(CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
SET(CMAKE_AR:FILEPATH /usr/bin/x86_64-w64-mingw32-ar)
SET(CMAKE_RANLIB:FILEPATH /usr/bin/x86_64-w64-mingw32-ranlib)

6
toolchain-mingw64.meson
View File

@ -1,7 +1,7 @@
[binaries]
c = '/usr/bin/x86_64-w64-mingw32-gcc'
cpp = '/usr/bin/x86_64-w64-mingw32-g++'
fortran = '/usr/bin/x86_64-w64-mingw32-gfortran'
c = 'x86_64-w64-mingw32-gcc'
cpp = 'x86_64-w64-mingw32-g++'
fortran = 'x86_64-w64-mingw32-gfortran'
rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc']
ar = '/usr/bin/x86_64-w64-mingw32-ar'
pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'