Commit Graph

26 Commits

Author SHA1 Message Date
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
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
Kalev Lember
276307b7b0 Add missing %mingw32_debug_install_post 2012-03-06 20:17:38 +02:00
Kalev Lember
f3b87dde70 Get rid of the USE_OLD_METHOD hack in mingw-find-debuginfo 2012-03-06 20:17:38 +02:00
Kalev Lember
f5e6db3480 Merge copy-n-paste duplicate %mingw32_debug_package code 2012-03-06 20:17:35 +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
Kalev Lember
32d1194882 Remove the mingw32-pkg-config wrapper as well 2012-01-31 22:04:23 +02:00
Erik van Pienbroek
92ccc6e10a Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now have a mingw32-pkg-config package 2012-01-31 20:38:26 +01:00
Erik van Pienbroek
4269348602 The %{_mingw32_qmake_qt4} macro pointed to an invalid mkspecs name. Fixed 2011-07-01 14:05:10 +02:00
Kalev Lember
74761330f7 Make sure the -debuginfo subpackages are mingw32- prefixed
... even if the base package is mingw-. Latest Fedora MinGW packaging
guidelines allow the base (source) package be named mingw-, but all
binary packages should be mingw32-.

http://lists.fedoraproject.org/pipermail/mingw/2011-May/003708.html
2011-05-29 17:17:54 +03:00
Kalev Lember
82ecebcd82 Fixed the -n option with _mingw32_debug_package macro
The -n option was passed down to -debuginfo subpackage's %package and
%description sections, but not to %files. This change fixes %files to
work the %same way as %package and %description.

Not sure yet if the -n option will get any use, but at least this fixes
an obvious oversight.

https://bugzilla.redhat.com/show_bug.cgi?id=700815#c12
2011-05-24 11:01:11 +03:00
Kalev Lember
9781763c8b Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/
Right now only mingw32-spice-protocol drops files in share/pkgconfig/,
but there are most likely more packages to come.
2011-05-24 10:50:37 +03:00
Erik van Pienbroek
2c67134589 Don't unset PKG_CONFIG_PATH in the wrapper scripts mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171) 2011-05-14 14:07:09 +02:00
Kalev Lember
5b66efd7ed Don't error out trying to set illegal LD.BFD variable name 2011-03-17 15:11:52 +02:00
Ivan Romanov
97e2f31e91 Removed -win32 option and fixed -spec option for mingw32-qmake-qt4 2010-11-14 15:08:36 +05:00
Ivan Romanov
a921aa1836 Added mingw32-qmake-qt4 2010-10-19 23:37:10 +06:00
epienbro
dc67d0699c Fixed a small rpmlint warning caused by the debuginfo generation macro
Thanks to Kalev Lember for spotting this
2009-08-23 18:50:36 +00:00
epienbro
d9bad00f48 - Add script to create -debuginfo subpackages This script was created by
Fridrich Strba
- All mingw32 packages now need to add these lines to their .spec files:
    %define __os_install_post %{_mingw32_debug_install_post}
    %{_mingw32_debug_package}
2009-06-22 10:18:35 +00:00
Richard W.M. Jones
7cf0edd56a Add CMake rules (Adam Goode) 2009-06-09 08:44:18 +00:00
Richard W.M. Jones
7a18fb8141 - Fix up and test mingw32-pkg-config changes.
Thu Mar 26 2009 Levente Farkas <lfarkas@lfarkas.org> - 50-1
- Add mingw32-pkg-config.
2009-03-27 09:20:25 +00:00
Richard W.M. Jones
3f88d62866 Fix _mingw32_configure. 2009-02-18 17:06:07 +00:00
Richard W.M. Jones
b8b00efeff - Rename mingw32-COPYING to COPYING.
- Rename mingw32-macros.mingw32 to macros.mingw32.
- _mingw32_configure looks for configure in "." and ".." dirs.
- Added _mingw32_description.
- Added mingw32(version.dll) virtual provides (rhbz#485842).
2009-02-17 08:37:27 +00:00