diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index aa80ec1..e2545d1 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -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 - 124-1 +- Use relative paths in cmake/meson toolchain files to make ccache work if + available + * Tue Sep 21 2021 Sandro Mani - 123-1 - Autogenerate mingw-python3 BR - Fix mingw{32/64}.attr to also capture pyd, pc files diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake index 70f6441..e8e321a 100644 --- a/toolchain-mingw32.cmake +++ b/toolchain-mingw32.cmake @@ -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) diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 4d3000b..99fe91a 100644 --- a/toolchain-mingw32.meson +++ b/toolchain-mingw32.meson @@ -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' diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake index b323e11..0ae6a74 100644 --- a/toolchain-mingw64.cmake +++ b/toolchain-mingw64.cmake @@ -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) diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson index 918bee0..2f633aa 100644 --- a/toolchain-mingw64.meson +++ b/toolchain-mingw64.meson @@ -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'