Commit Graph

23 Commits

Author SHA1 Message Date
Sandro Mani
0a51e8a6f9 Tweak cmake macro to allow overriding INCLUDE_INSTALL_DIR, fix double passed via mingw-scripts 2021-09-02 00:36:00 +02:00
Sandro Mani
f88d07b914 Allow overriding CFLAGS/CXXFLAGS/LDFLAGS for %%mingw_meson 2021-06-07 14:17:48 +02:00
Sandro Mani
8b144a44b6 Add -lssp to LDFLAGS 2020-07-27 16:10:52 +02:00
Sandro Mani
3e5c7d77dd Add -fstack-protector to LDFLAGS 2020-07-19 20:13:57 +02:00
Sandro Mani
3ad1f950f2 Fix mingw_meson resulting in ERROR: Unable to determine dynamic linker 2020-05-22 21:44:20 +02:00
Sandro Mani
782b104283 Add dlltool to toolchain-mingw{32,64}.meson 2019-08-29 23:09:34 +02:00
Sandro Mani
2fdaf5a89a Revert "Remove redundant in mingw_cmake and mingw_meson"
It causes no arguments at all to be passed to cmake
2019-02-14 21:42:43 +01:00
Elliott Sales de Andrade
ed40f14dd0 Remove redundant $@ in mingw_cmake and mingw_meson.
$@ is not used by the RPM macro _in RPM_ since it is executed as a line
by itself, not a script or function.

There's already a $@ in the mingw-scripts.sh file, so when expanded from
the macro, the script contains two $@, sending redundant arguments to
cmake and meson.
2019-02-05 18:14:32 -05:00
Elliott Sales de Andrade
bd0be208c7 Add macros and cross-file for meson and ninja. 2018-04-20 03:37:41 -04:00
Erik van Pienbroek
64394b95aa Accept empty MINGW{32,64}_{C,CPP,CXX}FLAGS environment variables 2015-04-11 19:07:25 +02:00
Erik van Pienbroek
2031da5ebb Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks CPack (RHBZ #1152696) 2015-04-11 19:07:25 +02:00
Erik van Pienbroek
6e3f91139b Allow verbose CMake output to be disabled (RHBZ #987644) 2015-04-11 19:07:25 +02:00
Erik van Pienbroek
5da13e5526 Removed the cmake rpath references as mingw doesn't support rpath 2015-04-11 19:07:25 +02:00
Erik van Pienbroek
a1d54d46a0 Made the CMake RPM macros more generic 2015-04-11 19:07:25 +02:00
Erik van Pienbroek
faf1180f11 Rename Toolchain-mingw{32,64}.cmake to toolchain-mingw{32,64}.cmake 2015-04-11 19:07:25 +02:00
Kalev Lember
f7e66214d7 Remove invalid macros with '++' in the name
https://lists.fedoraproject.org/pipermail/devel/2013-June/183886.html
2013-06-15 15:21:15 +02:00
Erik van Pienbroek
6f9eccdae6 Only set the environment variable PKG_CONFIG_LIBDIR in the cmake macros
- Only set the environment variable PKG_CONFIG_LIBDIR when
  using the macros %mingw32_cmake, %mingw32_cmake_kde4,
  %mingw64_cmake or %mingw64_cmake_kde4
- Fixes FTBFS of the mingw-matahari package
2013-06-02 17:31:30 +02:00
Erik van Pienbroek
ba334114c1 Removed the use of the environment variable PKG_CONFIG_LIBDIR
- Removed the use of the environment variable PKG_CONFIG_LIBDIR
  While building binaries the tool {i686,x86_64}-w64-mingw32-pkg-config
  should be used to find out pkg-config information
  The environment variable PKG_CONFIG already automatically points
  to the right cross-compiler aware version of pkg-config when
  the mingw{32,64}-pkg-config packages are installed
- Fixes compilation of mingw-gtk3 3.9.0 (GNOME BZ #699690)
- Automatically add R: mingw{32,64}-pkg-config tags when .pc files
  are detected while building mingw packages
2013-05-14 20:00:13 +02:00
Erik van Pienbroek
4c049af9fb Added new macros for Qt5 support
- Added new macros for Qt5 support, %mingw32_qmake_qt5, %mingw64_qmake_qt5,
  %mingw_qmake_qt4 and %mingw_qmake_qt5
- It isn't necessary to call %mingw32_env / %mingw64_env any more
  in the %mingw32_qmake_qt4 and %mingw64_qmake_qt4 macros
2012-09-18 00:10:08 +02:00
Erik van Pienbroek
328f054f6a Fix the handling of quoted arguments in the cmake macros 2012-08-13 20:56:01 +02:00
Kalev Lember
fcb9178d02 Fix syntax error in mingw64_env macro
Patch by Akira TAGOH.

https://bugzilla.redhat.com/show_bug.cgi?id=831534
2012-06-13 12:18:04 +03:00
Erik van Pienbroek
0cec28deb7 Prevent errors when the folders %{mingw32_prefix} or %{mingw64_prefix} are missing
and fix parse error when -config files containing a . are available in %{mingw32_bindir} or %{mingw64_bindir} (RHBZ #657478)
2012-06-06 21:02:08 +02:00
Erik van Pienbroek
0c1e1f998c Added support for both win32 and win64 targets
- Fixed rpmlint issues
- Fixed permissions of the scripts (775 -> 755)
- Fixed description of the various subpackages
- Make the various macros compliant with the new packaging guidelines:
  https://fedorahosted.org/fpc/ticket/71
- Suppress arch-independent-package-contains-binary-or-object rpmlint
  errors for static libraries
- Improved the mingw_configure, mingw_make, mingw_make_install,
  mingw_cmake and mingw_cmake_kde4 RPM macros so packagers don't need
  to use quotes anymore when using arguments. Thanks to Kalev Lember
  for the initial proof of concept
- Dropped the -mms-bitfields argument from the default CFLAGS as
  it is enabled by default as of gcc 4.7
- Replaced the CMake defines QT_HEADERS_DIR and QT_LIBRARY_DIR
  with QT_BINARY_DIR which is a more proper method to make CMake
  aware of the location of Qt. Thx to Dominik Schmidt for the hint
- Make sure CMake can detect the qmake-qt4 binary in /usr/$target/bin
- Make sure CMake can also detect the (native) Qt tools
  qdbuscpp2xml and qdbusxml2cpp
- Added new RPM macros mingw_cmake_kde4, mingw32_cmake_kde4 and
  mingw64_cmake_kde4
- Added three new environment variables which can be set to
  influence the behaviour of the cmake macros:
  MINGW_CMAKE_ARGS, MINGW32_CMAKE_ARGS and MINGW64_CMAKE_ARGS
- Dropped the mingw32-qmake-qt4 and mingw64-qmake-qt4 wrapper scripts
  as they're now provided by the mingw{32,64}-qt-qmake packages
- Added a new RPM macro: %%{?mingw_package_header}
  Packagers can use this macro instead of the original boilerplate
  code which is needed for all mingw packages
- Made argument passing using the backwards compatibility macro
  %%{_mingw32_cmake} work
- Fixed an issue in the mingw_cmake macro where it could point to
  a non-existant CMakeLists.txt file
- Fixed a bug in the find-requires script which causes all packages to
  depend
  on both the mingw32 and the mingw64 toolchains
- Split out the RPM macros which require both the
  mingw{32,64}-filesystem
  packages in a new file and put it in the mingw-filesystem-base package
- Generate seperate debuginfo packages for mingw32 and mingw64
- Set the minimum version of R: mingw{32,64}-filesystem to 70
- Use the correct FSF-address in some scripts
- Thanks to all the contributors: Erik van Pienbroek, Kalev Lember,
  Levente
  Farkas, Marc-Andre Lureau.
2012-02-27 17:33:08 +02:00