From d31db4f29dafe9e2fdf826220235776b54d1c24e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 29 Oct 2008 21:27:40 +0000 Subject: [PATCH 01/71] Setup of module mingw32-filesystem --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0b03da0 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: mingw32-filesystem +# $Id$ +NAME := mingw32-filesystem +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 66c68a39c77f191ac12d3fedab7b02b162275fe9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 30 Oct 2008 09:49:17 +0000 Subject: [PATCH 02/71] Imported mingw32-filesystem. --- mingw32-COPYING | 339 +++++++++++++++++++++++++++++++++++++++ mingw32-configure.sh | 39 +++++ mingw32-filesystem.spec | 214 ++++++++++++++++++++++++ mingw32-find-provides.sh | 20 +++ mingw32-find-requires.sh | 28 ++++ mingw32-macros.mingw32 | 46 ++++++ mingw32.csh | 1 + mingw32.sh | 1 + 8 files changed, 688 insertions(+) create mode 100644 mingw32-COPYING create mode 100755 mingw32-configure.sh create mode 100644 mingw32-filesystem.spec create mode 100755 mingw32-find-provides.sh create mode 100755 mingw32-find-requires.sh create mode 100644 mingw32-macros.mingw32 create mode 100644 mingw32.csh create mode 100644 mingw32.sh diff --git a/mingw32-COPYING b/mingw32-COPYING new file mode 100644 index 0000000..e77696a --- /dev/null +++ b/mingw32-COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/mingw32-configure.sh b/mingw32-configure.sh new file mode 100755 index 0000000..a8ed8fe --- /dev/null +++ b/mingw32-configure.sh @@ -0,0 +1,39 @@ +#!/bin/sh - + +# mingw32-configure +# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# This is a useful command-line script which configures +# a program for cross-compilation. It is meant to be +# the equivalent of the %{_mingw32_configure} macro in +# /etc/rpm/macros.mingw32 + +mingw32_prefix=/usr/i686-pc-mingw32/sys-root/mingw +mingw32_libdir=$mingw32_prefix/lib +mingw32_host=i686-pc-mingw32 +mingw32_target=i686-pc-mingw32 +mingw32_cc=i686-pc-mingw32-gcc +mingw32_cflags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" + +PKG_CONFIG_PATH="$mingw32_libdir/pkgconfig" \ +CC="$mingw32_cc" \ +CFLAGS="$mingw32_cflags" \ +./configure \ + --host=$mingw32_host \ + --target=$mingw32_target \ + --prefix=$mingw32_prefix \ + "$@" diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec new file mode 100644 index 0000000..297d6cb --- /dev/null +++ b/mingw32-filesystem.spec @@ -0,0 +1,214 @@ +%define debug_package %{nil} + +Name: mingw32-filesystem +Version: 34 +Release: 1%{?dist} +Summary: MinGW base filesystem and environment + +Group: Development/Libraries +License: GPLv2+ +URL: http://hg.et.redhat.com/misc/fedora-mingw--devel/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +Source0: mingw32-COPYING +Source1: mingw32-macros.mingw32 +#Source2: mingw32.sh +#Source3: mingw32.csh +Source4: mingw32-find-requires.sh +Source5: mingw32-find-provides.sh +Source6: mingw32-configure.sh + +Requires: setup +Requires: rpm + +# Note about 'Provides: mingw32(foo.dll)' +# ------------------------------------------------------------ +# +# We want to be able to build & install mingw32 libraries without +# necessarily needing to install wine. (And certainly not needing to +# install Windows!) There is no requirement to have wine installed in +# order to use the mingw toolchain to develop software (ie. to +# compile more stuff on top of it), so why require that? +# +# So for expediency, this base package provides the "missing" DLLs +# from Windows. Another way to do it would be to exclude these +# proprietary DLLs in our find-requires checking script - essentially +# it comes out the same either way. +# +Provides: mingw32(gdi32.dll) +Provides: mingw32(kernel32.dll) +Provides: mingw32(ole32.dll) +Provides: mingw32(mscoree.dll) +Provides: mingw32(msvcrt.dll) +Provides: mingw32(user32.dll) + +Obsoletes: mingw-filesystem = %{version}-%{release} +Provides: mingw-filesystem < 26 + + +%description +This package contains the base filesystem layout, RPM macros and +environment for all Fedora MinGW packages. + +This environment is maintained by the Fedora MinGW SIG at: + + http://fedoraproject.org/wiki/SIGs/MinGW + + +%prep +%setup -q -c -T +cp %{SOURCE0} COPYING +sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh + + +%build +# nothing + + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure + +#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32 + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32 + +# GCC requires these directories, even though they contain links +# to binaries which are also installed in /usr/bin etc. These +# contain Fedora native binaries. +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/bin +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/lib + +# The MinGW system root which will contain Windows native binaries +# and Windows-specific header files, pkgconfig, etc. +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/sys +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal + +# We don't normally package manual pages and info files, except +# where those are not supplied by a Fedora native package. So we +# need to create the directories. +# +# Note that some packages try to install stuff in +# /usr/i686-pc-mingw32/sys-root/mingw/man and +# /usr/i686-pc-mingw32/sys-root/mingw/doc +# but those are both packaging bugs. +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n} + +# NB. NOT _libdir +mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING +%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 +#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh +#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh +%{_bindir}/mingw32-configure +%{_prefix}/i686-pc-mingw32/ +/usr/lib/rpm/mingw32-* + + +%changelog +* Wed Oct 29 2008 Richard Jones - 34-1 +- Set --prefix correctly. + +* Wed Oct 29 2008 Richard Jones - 33-1 +- Remove mingw32.{sh,csh} which are unused. + +* Mon Oct 27 2008 Richard Jones - 32-1 +- Add mingw32-configure script. + +* Mon Oct 27 2008 Richard Jones - 31-1 +- Update the spec file with explanation of the 'Provides: mingw32(...)' + lines for Windows system DLLs. + +* Mon Oct 6 2008 Richard Jones - 30-1 +- Added _mingw32_cxx. + +* Thu Sep 25 2008 Richard Jones - 29-1 +- Added _mingw32_as, _mingw32_dlltool, _mingw32_windres. + +* Wed Sep 24 2008 Richard W.M. Jones - 27-1 +- Begin the grand renaming of mingw -> mingw32. +- Added mingw32(mscoree.dll). + +* Sun Sep 21 2008 Richard W.M. Jones - 25-1 +- Add shared aclocal directory. + +* Sun Sep 21 2008 Richard W.M. Jones - 24-1 +- Remove mingw-defs, since no longer used. +- Add _mingw_infodir. + +* Thu Sep 11 2008 Daniel P. Berrange - 23-1 +- Add macros for find-provides/requires scripts + +* Wed Sep 10 2008 Richard W.M. Jones - 22-1 +- Windows provides OLE32.DLL. + +* Wed Sep 10 2008 Richard W.M. Jones - 21-1 +- Allow '.' in dll names for find-requires +- Windows provides GDI32.DLL. + +* Fri Sep 5 2008 Richard W.M. Jones - 20-1 +- On 64 bit install in /usr/lib/rpm always. + +* Thu Sep 4 2008 Richard W.M. Jones - 19-1 +- 'user32.dll' is provided by Windows. +- Allow '-' in DLL names. +- More accurate detection of DLLs in requires/provides scripts. + +* Mon Sep 4 2008 Richard W.M. Jones - 17-1 +- Automatically add mingw-filesystem and mingw-runtime requires. +- Add --prefix to _mingw_configure macro. +- Three backslashes required on each continuation line in RPM macros. + +* Mon Sep 4 2008 Richard W.M. Jones - 14-1 +- Fix path to mingw-find-requires/provides scripts. + +* Mon Sep 4 2008 Richard W.M. Jones - 12-1 +- Put CFLAGS on a single line to avoid problems in some configure scripts. + +* Mon Sep 4 2008 Richard W.M. Jones - 10-1 +- Provides certain base Windows DLLs (not literally). + +* Mon Sep 4 2008 Richard W.M. Jones - 9-1 +- Include RPM dependency generators and definitions. + +* Mon Sep 4 2008 Richard W.M. Jones - 4-1 +- Add _mingw_cc/cflags/etc. and _mingw_configure macros. + +* Mon Sep 4 2008 Richard W.M. Jones - 3-1 +- Add _mingw_host macro. + +* Mon Sep 4 2008 Richard W.M. Jones - 2-1 +- Add _mingw_sysroot macro. +- Add _mingw_target macro. + +* Mon Sep 4 2008 Richard W.M. Jones - 1-1 +- Basic filesystem layout. diff --git a/mingw32-find-provides.sh b/mingw32-find-provides.sh new file mode 100755 index 0000000..966360b --- /dev/null +++ b/mingw32-find-provides.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant provides +# information that needs to be included in the package. + +if [ "$1" ] +then + package_name="$1" +fi + +[ -z "$OBJDUMP" ] && OBJDUMP=i686-pc-mingw32-objdump + +filelist=`sed "s/['\"]/\\\&/g"` + +dlls=$(echo $filelist | tr [:blank:] '\n' | grep '\.dll$') + +for f in $dlls; do + basename=`basename $f | tr [:upper:] [:lower:]` + echo "mingw32($basename)" +done diff --git a/mingw32-find-requires.sh b/mingw32-find-requires.sh new file mode 100755 index 0000000..ff8bb39 --- /dev/null +++ b/mingw32-find-requires.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# This script reads filenames from STDIN and outputs any relevant provides +# information that needs to be included in the package. + +if [ "$1" ] +then + package_name="$1" +fi + +[ -z "$OBJDUMP" ] && OBJDUMP=i686-pc-mingw32-objdump + +# Get the list of files. + +filelist=`sed "s/['\"]/\\\&/g"` + +# Everything requires mingw32-filesystem of at least the current version +# and mingw32-runtime. +echo 'mingw32-filesystem >= @VERSION@' +echo 'mingw32-runtime' + +dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') + +for f in $dlls; do + $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' | + tr [:upper:] [:lower:] | + sed 's/\(.*\)/mingw32(\1)/' +done | sort -u diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 new file mode 100644 index 0000000..8552b9a --- /dev/null +++ b/mingw32-macros.mingw32 @@ -0,0 +1,46 @@ +# RPM macros for Fedora MinGW. + +# Paths. +%_mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root +%_mingw32_prefix %{_mingw32_sysroot}/mingw +%_mingw32_bindir %{_mingw32_prefix}/bin +%_mingw32_sbindir %{_mingw32_prefix}/sbin +%_mingw32_libdir %{_mingw32_prefix}/lib +%_mingw32_libexecdir %{_mingw32_prefix}/libexec +%_mingw32_datadir %{_mingw32_prefix}/share +%_mingw32_docdir %{_mingw32_prefix}/share/doc +%_mingw32_infodir %{_mingw32_prefix}/share/info +%_mingw32_mandir %{_mingw32_prefix}/share/man +%_mingw32_sysconfdir %{_mingw32_prefix}/etc +%_mingw32_includedir %{_mingw32_prefix}/include + +# Build macros. +%_mingw32_host i686-pc-mingw32 +%_mingw32_target i686-pc-mingw32 + +%_mingw32_cflags -O2 -g -pipe -Wall \\\ + -Wp,-D_FORTIFY_SOURCE=2 \\\ + -fexceptions \\\ + --param=ssp-buffer-size=4 + +%_mingw32_cc i686-pc-mingw32-gcc +%_mingw32_cpp i686-pc-mingw32-gcc -E +%_mingw32_ar i686-pc-mingw32-ar +%_mingw32_as i686-pc-mingw32-as +%_mingw32_dlltool i686-pc-mingw32-dlltool +%_mingw32_ranlib i686-pc-mingw32-ranlib +%_mingw32_strip i686-pc-mingw32-strip +%_mingw32_objdump i686-pc-mingw32-objdump +%_mingw32_windres i686-pc-mingw32-windres +%_mingw32_cxx i686-pc-mingw32-g++ + +%_mingw32_findprovides /usr/lib/rpm/mingw32-find-provides.sh +%_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh + +%_mingw32_configure \ + PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig" \\\ + CC="%{_mingw32_cc}" \\\ + CFLAGS="%{_mingw32_cflags}" \\\ + ./configure \\\ + --build=%_build --host=%{_mingw32_host} --target=%{_mingw32_target} \\\ + --prefix=%{_mingw32_prefix} diff --git a/mingw32.csh b/mingw32.csh new file mode 100644 index 0000000..89d8b66 --- /dev/null +++ b/mingw32.csh @@ -0,0 +1 @@ +# Environment variables for MinGW. diff --git a/mingw32.sh b/mingw32.sh new file mode 100644 index 0000000..89d8b66 --- /dev/null +++ b/mingw32.sh @@ -0,0 +1 @@ +# Environment variables for MinGW. From 61787a4b62cc2f0a8d0a0a52a42be9782b30c65d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 13 Nov 2008 16:40:51 +0000 Subject: [PATCH 03/71] - Added mingw32(wldap32.dll) pseudo-provides. --- mingw32-filesystem.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 297d6cb..7503e25 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 34 +Version: 35 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -42,6 +42,7 @@ Provides: mingw32(ole32.dll) Provides: mingw32(mscoree.dll) Provides: mingw32(msvcrt.dll) Provides: mingw32(user32.dll) +Provides: mingw32(wldap32.dll) Obsoletes: mingw-filesystem = %{version}-%{release} Provides: mingw-filesystem < 26 @@ -135,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 13 2008 Richard Jones - 35-1 +- Added mingw32(wldap32.dll) pseudo-provides. + * Wed Oct 29 2008 Richard Jones - 34-1 - Set --prefix correctly. From c52d9aaa64ebbe614685e0900d241e47931c0910 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Nov 2008 15:33:30 +0000 Subject: [PATCH 04/71] - Greatly improved macros (Levente Farkas). - Added -mms-bitfields. --- mingw32-configure.sh | 2 +- mingw32-filesystem.spec | 6 +++- mingw32-macros.mingw32 | 76 +++++++++++++++++++++++++++++++++-------- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/mingw32-configure.sh b/mingw32-configure.sh index a8ed8fe..01d2ef9 100755 --- a/mingw32-configure.sh +++ b/mingw32-configure.sh @@ -27,7 +27,7 @@ mingw32_libdir=$mingw32_prefix/lib mingw32_host=i686-pc-mingw32 mingw32_target=i686-pc-mingw32 mingw32_cc=i686-pc-mingw32-gcc -mingw32_cflags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4" +mingw32_cflags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields" PKG_CONFIG_PATH="$mingw32_libdir/pkgconfig" \ CC="$mingw32_cc" \ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 7503e25..2d172e5 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 35 +Version: 36 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -136,6 +136,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 19 2008 Richard Jones - 36-1 +- Greatly improved macros (Levente Farkas). +- Added -mms-bitfields. + * Thu Nov 13 2008 Richard Jones - 35-1 - Added mingw32(wldap32.dll) pseudo-provides. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index 8552b9a..a74b286 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -3,25 +3,26 @@ # Paths. %_mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root %_mingw32_prefix %{_mingw32_sysroot}/mingw -%_mingw32_bindir %{_mingw32_prefix}/bin -%_mingw32_sbindir %{_mingw32_prefix}/sbin -%_mingw32_libdir %{_mingw32_prefix}/lib -%_mingw32_libexecdir %{_mingw32_prefix}/libexec +%_mingw32_exec_prefix %{_mingw32_prefix} +%_mingw32_bindir %{_mingw32_exec_prefix}/bin +%_mingw32_sbindir %{_mingw32_exec_prefix}/sbin +%_mingw32_libexecdir %{_mingw32_exec_prefix}/libexec +%_mingw32_libdir %{_mingw32_exec_prefix}/lib %_mingw32_datadir %{_mingw32_prefix}/share %_mingw32_docdir %{_mingw32_prefix}/share/doc %_mingw32_infodir %{_mingw32_prefix}/share/info %_mingw32_mandir %{_mingw32_prefix}/share/man %_mingw32_sysconfdir %{_mingw32_prefix}/etc +%_mingw32_sharedstatedir %{_mingw32_prefix}/com +%_mingw32_localstatedir %{_mingw32_prefix}/var %_mingw32_includedir %{_mingw32_prefix}/include # Build macros. %_mingw32_host i686-pc-mingw32 +%_mingw32_build %{_mingw32_host} %_mingw32_target i686-pc-mingw32 -%_mingw32_cflags -O2 -g -pipe -Wall \\\ - -Wp,-D_FORTIFY_SOURCE=2 \\\ - -fexceptions \\\ - --param=ssp-buffer-size=4 +%_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields %_mingw32_cc i686-pc-mingw32-gcc %_mingw32_cpp i686-pc-mingw32-gcc -E @@ -31,16 +32,61 @@ %_mingw32_ranlib i686-pc-mingw32-ranlib %_mingw32_strip i686-pc-mingw32-strip %_mingw32_objdump i686-pc-mingw32-objdump +%_mingw32_nm i686-pc-mingw32-nm %_mingw32_windres i686-pc-mingw32-windres %_mingw32_cxx i686-pc-mingw32-g++ +%_mingw32_cache mingw32-config.cache + %_mingw32_findprovides /usr/lib/rpm/mingw32-find-provides.sh %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh -%_mingw32_configure \ - PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig" \\\ - CC="%{_mingw32_cc}" \\\ - CFLAGS="%{_mingw32_cflags}" \\\ - ./configure \\\ - --build=%_build --host=%{_mingw32_host} --target=%{_mingw32_target} \\\ - --prefix=%{_mingw32_prefix} +%_mingw32_env HOST_CC=gcc; export HOST_CC; \ + NM="%{_mingw32_nm}"; export NM; \ + OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \ + PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ + CC="${MINGW_CC:-%_mingw32_cc}"; export CC; \ + CXX="${MINGW_CXX:-%_mingw32_cxx}"; export CXX; \ + CFLAGS="${MINGW_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ + CXXFLAGS="${MINGW_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ + for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \ + CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \ + declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \ + done + +%_mingw32_configure %{_mingw32_env} ; \ + ./configure --cache-file=%{_mingw32_cache} \\\ + --host=%{_mingw32_host} \\\ + --build=%{_mingw32_build} \\\ + --target=%{_mingw32_target} \\\ + --prefix=%{_mingw32_prefix} \\\ + --exec-prefix=%{_mingw32_exec_prefix} \\\ + --bindir=%{_mingw32_bindir} \\\ + --sbindir=%{_mingw32_sbindir} \\\ + --sysconfdir=%{_mingw32_sysconfdir} \\\ + --datadir=%{_mingw32_datadir} \\\ + --includedir=%{_mingw32_includedir} \\\ + --libdir=%{_mingw32_libdir} \\\ + --libexecdir=%{_mingw32_libexecdir} \\\ + --localstatedir=%{_mingw32_localstatedir} \\\ + --sharedstatedir=%{_mingw32_sharedstatedir} \\\ + --mandir=%{_mingw32_mandir} \\\ + --infodir=%{_mingw32_infodir} + +%_mingw32_make %{_mingw32_env} ; \ + make \\\ + prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\ + exec_prefix=%{?buildroot:%{buildroot}}%{_mingw32_exec_prefix} \\\ + bindir=%{?buildroot:%{buildroot}}%{_mingw32_bindir} \\\ + sbindir=%{?buildroot:%{buildroot}}%{_mingw32_sbindir} \\\ + sysconfdir=%{?buildroot:%{buildroot}}%{_mingw32_sysconfdir} \\\ + datadir=%{?buildroot:%{buildroot}}%{_mingw32_datadir} \\\ + includedir=%{?buildroot:%{buildroot}}%{_mingw32_includedir} \\\ + libdir=%{?buildroot:%{buildroot}}%{_mingw32_libdir} \\\ + libexecdir=%{?buildroot:%{buildroot}}%{_mingw32_libexecdir} \\\ + localstatedir=%{?buildroot:%{buildroot}}%{_mingw32_localstatedir} \\\ + sharedstatedir=%{?buildroot:%{buildroot}}%{_mingw32_sharedstatedir} \\\ + mandir=%{?buildroot:%{buildroot}}%{_mingw32_mandir} \\\ + infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} + +%_mingw32_makeinstall %{_mingw32_make} install From 03e2b36396a3cb4b4c36e9503358e1bdd15cea3e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Nov 2008 18:02:20 +0000 Subject: [PATCH 05/71] Revert part of the 36-1 patch. --build option to configure was wrong. --- mingw32-filesystem.spec | 5 ++++- mingw32-macros.mingw32 | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 2d172e5..56e8434 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 36 +Version: 37 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 19 2008 Richard Jones - 37-1 +- Revert part of the 36-1 patch. --build option to configure was wrong. + * Wed Nov 19 2008 Richard Jones - 36-1 - Greatly improved macros (Levente Farkas). - Added -mms-bitfields. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index a74b286..fe7c89d 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -19,7 +19,6 @@ # Build macros. %_mingw32_host i686-pc-mingw32 -%_mingw32_build %{_mingw32_host} %_mingw32_target i686-pc-mingw32 %_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields @@ -57,7 +56,7 @@ %_mingw32_configure %{_mingw32_env} ; \ ./configure --cache-file=%{_mingw32_cache} \\\ --host=%{_mingw32_host} \\\ - --build=%{_mingw32_build} \\\ + --build=%_build \\\ --target=%{_mingw32_target} \\\ --prefix=%{_mingw32_prefix} \\\ --exec-prefix=%{_mingw32_exec_prefix} \\\ From 4b7d67464c60276cdf061235dff191fc19d0fc94 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 23 Nov 2008 22:18:00 +0000 Subject: [PATCH 06/71] Added mingw32(glut32.dll). --- mingw32-filesystem.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 56e8434..ae935bd 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 37 +Version: 38 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -43,6 +43,7 @@ Provides: mingw32(mscoree.dll) Provides: mingw32(msvcrt.dll) Provides: mingw32(user32.dll) Provides: mingw32(wldap32.dll) +Provides: mingw32(glut32.dll) Obsoletes: mingw-filesystem = %{version}-%{release} Provides: mingw-filesystem < 26 @@ -136,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 23 2008 Richard Jones - 38-1 +- Added mingw32(glut32.dll). + * Wed Nov 19 2008 Richard Jones - 37-1 - Revert part of the 36-1 patch. --build option to configure was wrong. From b8c580465a96d8eb902a81d19224a8e0b9e1168a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 24 Nov 2008 16:08:07 +0000 Subject: [PATCH 07/71] - Unify mingw32-filesystem packages from all three branches again, and test. - Fix mingw32-scripts so it can handle extra parameters correctly. - Remove mingw32-env & mingw32-make since neither of them actually work. --- mingw32-filesystem.spec | 24 +++++++++++++------ mingw32-macros.mingw32 | 28 ++++++++++++---------- mingw32-configure.sh => mingw32-scripts.sh | 24 +++++-------------- 3 files changed, 38 insertions(+), 38 deletions(-) rename mingw32-configure.sh => mingw32-scripts.sh (53%) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index ae935bd..755f104 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 38 -Release: 1%{?dist} +Version: 39 +Release: 3%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -17,7 +17,7 @@ Source1: mingw32-macros.mingw32 #Source3: mingw32.csh Source4: mingw32-find-requires.sh Source5: mingw32-find-provides.sh -Source6: mingw32-configure.sh +Source6: mingw32-scripts.sh Requires: setup Requires: rpm @@ -45,9 +45,6 @@ Provides: mingw32(user32.dll) Provides: mingw32(wldap32.dll) Provides: mingw32(glut32.dll) -Obsoletes: mingw-filesystem = %{version}-%{release} -Provides: mingw-filesystem < 26 - %description This package contains the base filesystem layout, RPM macros and @@ -73,8 +70,15 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts + mkdir -p $RPM_BUILD_ROOT%{_bindir} -install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure +pushd $RPM_BUILD_ROOT%{_bindir} +for i in mingw32-configure; do + ln -s %{_libexecdir}/mingw32-scripts $i +done +popd #mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d #install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ @@ -132,11 +136,17 @@ rm -rf $RPM_BUILD_ROOT #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh %{_bindir}/mingw32-configure +%{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ /usr/lib/rpm/mingw32-* %changelog +* Mon Nov 24 2008 Richard W.M. Jones - 39-3 +- Unify mingw32-filesystem packages from all three branches again, and test. +- Fix mingw32-scripts so it can handle extra parameters correctly. +- Remove mingw32-env & mingw32-make since neither of them actually work. + * Sun Nov 23 2008 Richard Jones - 38-1 - Added mingw32(glut32.dll). diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index fe7c89d..87e34ea 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -23,16 +23,16 @@ %_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%_mingw32_cc i686-pc-mingw32-gcc -%_mingw32_cpp i686-pc-mingw32-gcc -E -%_mingw32_ar i686-pc-mingw32-ar -%_mingw32_as i686-pc-mingw32-as -%_mingw32_dlltool i686-pc-mingw32-dlltool -%_mingw32_ranlib i686-pc-mingw32-ranlib -%_mingw32_strip i686-pc-mingw32-strip -%_mingw32_objdump i686-pc-mingw32-objdump +%_mingw32_cc i686-pc-mingw32-gcc +%_mingw32_cpp i686-pc-mingw32-gcc -E +%_mingw32_ar i686-pc-mingw32-ar +%_mingw32_as i686-pc-mingw32-as +%_mingw32_dlltool i686-pc-mingw32-dlltool +%_mingw32_ranlib i686-pc-mingw32-ranlib +%_mingw32_strip i686-pc-mingw32-strip +%_mingw32_objdump i686-pc-mingw32-objdump %_mingw32_nm i686-pc-mingw32-nm -%_mingw32_windres i686-pc-mingw32-windres +%_mingw32_windres i686-pc-mingw32-windres %_mingw32_cxx i686-pc-mingw32-g++ %_mingw32_cache mingw32-config.cache @@ -41,13 +41,15 @@ %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh %_mingw32_env HOST_CC=gcc; export HOST_CC; \ + AS="%{_mingw32_as}"; export AS; \ + AR="%{_mingw32_ar}"; export AR; \ NM="%{_mingw32_nm}"; export NM; \ OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \ PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ - CC="${MINGW_CC:-%_mingw32_cc}"; export CC; \ - CXX="${MINGW_CXX:-%_mingw32_cxx}"; export CXX; \ - CFLAGS="${MINGW_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ - CXXFLAGS="${MINGW_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ + CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \ + CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \ + CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ + CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \ CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \ declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \ diff --git a/mingw32-configure.sh b/mingw32-scripts.sh similarity index 53% rename from mingw32-configure.sh rename to mingw32-scripts.sh index 01d2ef9..4362ed3 100755 --- a/mingw32-configure.sh +++ b/mingw32-scripts.sh @@ -2,6 +2,7 @@ # mingw32-configure # Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones. +# Copyright (C) 2008 Levente Farkas # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,23 +18,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# This is a useful command-line script which configures -# a program for cross-compilation. It is meant to be -# the equivalent of the %{_mingw32_configure} macro in -# /etc/rpm/macros.mingw32 +# This is a useful command-line script through which one can use the +# macros from mingw32-macros.mingw32 cross-compilation. -mingw32_prefix=/usr/i686-pc-mingw32/sys-root/mingw -mingw32_libdir=$mingw32_prefix/lib -mingw32_host=i686-pc-mingw32 -mingw32_target=i686-pc-mingw32 -mingw32_cc=i686-pc-mingw32-gcc -mingw32_cflags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields" +# XXX This doesn't handle quoting of extra parameters which contain +# spaces correctly. -PKG_CONFIG_PATH="$mingw32_libdir/pkgconfig" \ -CC="$mingw32_cc" \ -CFLAGS="$mingw32_cflags" \ -./configure \ - --host=$mingw32_host \ - --target=$mingw32_target \ - --prefix=$mingw32_prefix \ - "$@" +rpm --eval "%{_"`basename $0|tr "-" "_"`"} $@"|sh From 1ea30e613c918c23971ce46ea937e87108a39522 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 6 Dec 2008 14:33:41 +0000 Subject: [PATCH 08/71] - Rewrite mingw32-scripts to run in the current shell - (Re-add mingw32-make) - Removed by RWMJ. - Add mingw32-env to mingw32.sh --- mingw32-filesystem.spec | 20 +++++++++----- mingw32-macros.mingw32 | 61 ++++++++++++++++++++++++++--------------- mingw32-scripts.sh | 8 ++---- mingw32.sh | 2 ++ 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 755f104..20b88e0 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 39 -Release: 3%{?dist} +Version: 40 +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -13,7 +13,7 @@ BuildArch: noarch Source0: mingw32-COPYING Source1: mingw32-macros.mingw32 -#Source2: mingw32.sh +Source2: mingw32.sh #Source3: mingw32.csh Source4: mingw32-find-requires.sh Source5: mingw32-find-provides.sh @@ -75,13 +75,14 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure; do +for i in mingw32-configure ; do ln -s %{_libexecdir}/mingw32-scripts $i done popd -#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -#install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ +#install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32 @@ -133,7 +134,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 -#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh +%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh %{_bindir}/mingw32-configure %{_libexecdir}/mingw32-scripts @@ -142,6 +143,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Dec 6 2008 Levente Farkas - 40-2 +- Rewrite mingw32-scripts to run in the current shell +- (Re-add mingw32-make) - Removed by RWMJ. +- Add mingw32-env to mingw32.sh + * Mon Nov 24 2008 Richard W.M. Jones - 39-3 - Unify mingw32-filesystem packages from all three branches again, and test. - Fix mingw32-scripts so it can handle extra parameters correctly. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index 87e34ea..ada3b08 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -1,7 +1,9 @@ # RPM macros for Fedora MinGW. +%_mingw32_target i686-pc-mingw32 + # Paths. -%_mingw32_sysroot %{_prefix}/i686-pc-mingw32/sys-root +%_mingw32_sysroot %{_prefix}/%{_mingw32_target}/sys-root %_mingw32_prefix %{_mingw32_sysroot}/mingw %_mingw32_exec_prefix %{_mingw32_prefix} %_mingw32_bindir %{_mingw32_exec_prefix}/bin @@ -18,22 +20,33 @@ %_mingw32_includedir %{_mingw32_prefix}/include # Build macros. -%_mingw32_host i686-pc-mingw32 -%_mingw32_target i686-pc-mingw32 +%_mingw32_host %{_mingw32_target} %_mingw32_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%_mingw32_cc i686-pc-mingw32-gcc -%_mingw32_cpp i686-pc-mingw32-gcc -E -%_mingw32_ar i686-pc-mingw32-ar -%_mingw32_as i686-pc-mingw32-as -%_mingw32_dlltool i686-pc-mingw32-dlltool -%_mingw32_ranlib i686-pc-mingw32-ranlib -%_mingw32_strip i686-pc-mingw32-strip -%_mingw32_objdump i686-pc-mingw32-objdump -%_mingw32_nm i686-pc-mingw32-nm -%_mingw32_windres i686-pc-mingw32-windres -%_mingw32_cxx i686-pc-mingw32-g++ +%_mingw32_cc %{_mingw32_target}-gcc +%_mingw32_cxx %{_mingw32_target}-g++ +%_mingw32_cpp %{_mingw32_target}-gcc -E +%_mingw32_addr2line %{_mingw32_target}-addr2line +%_mingw32_ar %{_mingw32_target}-ar +%_mingw32_as %{_mingw32_target}-as +%_mingw32_c++ %{_mingw32_target}-c++ +%_mingw32_c++filt %{_mingw32_target}-c++filt +%_mingw32_dlltool %{_mingw32_target}-dlltool +%_mingw32_dllwrap %{_mingw32_target}-dllwrap +%_mingw32_gcov %{_mingw32_target}-gcov +%_mingw32_gprof %{_mingw32_target}-gprof +%_mingw32_ld %{_mingw32_target}-ld +%_mingw32_nm %{_mingw32_target}-nm +%_mingw32_objcopy %{_mingw32_target}-objcopy +%_mingw32_objdump %{_mingw32_target}-objdump +%_mingw32_ranlib %{_mingw32_target}-ranlib +%_mingw32_readelf %{_mingw32_target}-readelf +%_mingw32_size %{_mingw32_target}-size +%_mingw32_strings %{_mingw32_target}-strings +%_mingw32_strip %{_mingw32_target}-strip +%_mingw32_windmc %{_mingw32_target}-windmc +%_mingw32_windres %{_mingw32_target}-windres %_mingw32_cache mingw32-config.cache @@ -41,19 +54,23 @@ %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh %_mingw32_env HOST_CC=gcc; export HOST_CC; \ - AS="%{_mingw32_as}"; export AS; \ - AR="%{_mingw32_ar}"; export AR; \ - NM="%{_mingw32_nm}"; export NM; \ - OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \ PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \ CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \ CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ - for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \ - CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \ - declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \ - done + _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ + for i in `ls ${_PREFIX}*|egrep -v "gcc-"`; do \ + x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \ + declare -x $x="$i" ; export $x; \ + done; \ + unset _PREFIX; \ + for i in `ls %{_mingw32_bindir}/*|grep -- "-config\$"` ; do \ + x=`basename $i|tr "a-z+-" "A-ZX_"`; \ + declare -x $x="$i" ; export $x; \ + done; \ + unset x i + %_mingw32_configure %{_mingw32_env} ; \ ./configure --cache-file=%{_mingw32_cache} \\\ diff --git a/mingw32-scripts.sh b/mingw32-scripts.sh index 4362ed3..24af47a 100755 --- a/mingw32-scripts.sh +++ b/mingw32-scripts.sh @@ -1,6 +1,6 @@ #!/bin/sh - -# mingw32-configure +# mingw32-scripts # Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones. # Copyright (C) 2008 Levente Farkas # @@ -21,7 +21,5 @@ # This is a useful command-line script through which one can use the # macros from mingw32-macros.mingw32 cross-compilation. -# XXX This doesn't handle quoting of extra parameters which contain -# spaces correctly. - -rpm --eval "%{_"`basename $0|tr "-" "_"`"} $@"|sh +NAME="_`basename $0|tr -- - _`" +eval "`rpm --eval "%{$NAME}"`" "$@" diff --git a/mingw32.sh b/mingw32.sh index 89d8b66..94e4dec 100644 --- a/mingw32.sh +++ b/mingw32.sh @@ -1 +1,3 @@ # Environment variables for MinGW. + +alias mingw32-env='eval `rpm --eval %{_mingw32_env}`' From 2caed6fee8a34fe7da605b7e0e42a32b4a2c4c81 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 18 Dec 2008 10:53:30 +0000 Subject: [PATCH 09/71] - Re-add mingw32-make --- mingw32-filesystem.spec | 10 +++++++--- mingw32-macros.mingw32 | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 20b88e0..4ae95cc 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 40 -Release: 2%{?dist} +Version: 41 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -75,7 +75,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure ; do +for i in mingw32-configure mingw32-make; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -137,12 +137,16 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh %{_bindir}/mingw32-configure +%{_bindir}/mingw32-make %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ /usr/lib/rpm/mingw32-* %changelog +* Wed Dec 17 2008 Levente Farkas - 41-1 +- Re-add mingw32-make + * Sat Dec 6 2008 Levente Farkas - 40-2 - Rewrite mingw32-scripts to run in the current shell - (Re-add mingw32-make) - Removed by RWMJ. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index ada3b08..6555424 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -92,6 +92,22 @@ --infodir=%{_mingw32_infodir} %_mingw32_make %{_mingw32_env} ; \ + make \\\ + prefix=%{_mingw32_prefix} \\\ + exec_prefix=%{_mingw32_exec_prefix} \\\ + bindir=%{_mingw32_bindir} \\\ + sbindir=%{_mingw32_sbindir} \\\ + sysconfdir=%{_mingw32_sysconfdir} \\\ + datadir=%{_mingw32_datadir} \\\ + includedir=%{_mingw32_includedir} \\\ + libdir=%{_mingw32_libdir} \\\ + libexecdir=%{_mingw32_libexecdir} \\\ + localstatedir=%{_mingw32_localstatedir} \\\ + sharedstatedir=%{_mingw32_sharedstatedir} \\\ + mandir=%{_mingw32_mandir} \\\ + infodir=%{_mingw32_infodir} + +%_mingw32_makeinstall %{_mingw32_env} ; \ make \\\ prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\ exec_prefix=%{?buildroot:%{buildroot}}%{_mingw32_exec_prefix} \\\ @@ -105,6 +121,6 @@ localstatedir=%{?buildroot:%{buildroot}}%{_mingw32_localstatedir} \\\ sharedstatedir=%{?buildroot:%{buildroot}}%{_mingw32_sharedstatedir} \\\ mandir=%{?buildroot:%{buildroot}}%{_mingw32_mandir} \\\ - infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} + infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\ + install -%_mingw32_makeinstall %{_mingw32_make} install From f65d0b03d6e1a75789d6170e74ef637314f890be Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Jan 2009 10:18:27 +0000 Subject: [PATCH 10/71] Add pseudo-provides secur32.dll --- mingw32-filesystem.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 4ae95cc..7c9b11a 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -44,6 +44,7 @@ Provides: mingw32(msvcrt.dll) Provides: mingw32(user32.dll) Provides: mingw32(wldap32.dll) Provides: mingw32(glut32.dll) +Provides: mingw32(secur32.dll) %description @@ -144,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 14 2009 Richard W.M. Jones - 42-1 +- Add pseudo-provides secur32.dll + * Wed Dec 17 2008 Levente Farkas - 41-1 - Re-add mingw32-make From 306b2a18596bc13a5f1a5836244377b4a70e0ad7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 14 Jan 2009 10:20:03 +0000 Subject: [PATCH 11/71] Add pseudo-provides secur32.dll --- mingw32-filesystem.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 7c9b11a..429016e 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 41 +Version: 42 Release: 1%{?dist} Summary: MinGW base filesystem and environment From c0320ed08998c3000bd63df921614988688dc28c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 24 Jan 2009 18:11:43 +0000 Subject: [PATCH 12/71] - Don't claim C++ compiler exists if it's not installed, as this breaks autoconf and (in particular) libtool. --- mingw32-filesystem.spec | 8 ++++++-- mingw32-macros.mingw32 | 16 +++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 429016e..faf6ae5 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 42 -Release: 1%{?dist} +Version: 43 +Release: 6%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -145,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 24 2009 Richard W.M. Jones - 43-6 +- Don't claim C++ compiler exists if it's not installed, as this + breaks autoconf and (in particular) libtool. + * Wed Jan 14 2009 Richard W.M. Jones - 42-1 - Add pseudo-provides secur32.dll diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index 6555424..cbc05ca 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -55,16 +55,22 @@ %_mingw32_env HOST_CC=gcc; export HOST_CC; \ PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ - CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \ - CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \ - CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ - CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ - for i in `ls ${_PREFIX}*|egrep -v "gcc-"`; do \ + for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \ declare -x $x="$i" ; export $x; \ done; \ unset _PREFIX; \ + CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \ + CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \ + if [ -x "%{_bindir}/%{_mingw32_cxx}" ]; then \ + CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \ + CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \ + else \ + CXX=; export CXX; \ + ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ + CXXFLAGS=; export CXXFLAGS; \ + fi; \ for i in `ls %{_mingw32_bindir}/*|grep -- "-config\$"` ; do \ x=`basename $i|tr "a-z+-" "A-ZX_"`; \ declare -x $x="$i" ; export $x; \ From 671fa62d9e6e394fa7b4da1fa8b6b1ada39ea791 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 26 Jan 2009 17:21:27 +0000 Subject: [PATCH 13/71] - Install rpmlint overrides file to suppress some rpmlint warnings. --- mingw32-filesystem.spec | 15 +++++++++++++-- mingw32-rpmlint.config | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 mingw32-rpmlint.config diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index faf6ae5..21d9464 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 43 -Release: 6%{?dist} +Version: 44 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -18,9 +18,13 @@ Source2: mingw32.sh Source4: mingw32-find-requires.sh Source5: mingw32-find-provides.sh Source6: mingw32-scripts.sh +Source7: mingw32-rpmlint.config Requires: setup Requires: rpm +Requires: rpmlint >= 0.85-2 + +BuildRequires: rpmlint >= 0.85-2 # Note about 'Provides: mingw32(foo.dll)' # ------------------------------------------------------------ @@ -88,6 +92,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.mingw32 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint +install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/ + mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32 # GCC requires these directories, even though they contain links @@ -137,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh +%config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %{_bindir}/mingw32-configure %{_bindir}/mingw32-make %{_libexecdir}/mingw32-scripts @@ -145,6 +153,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 26 2009 Richard W.M. Jones - 44-1 +- Install rpmlint overrides file to suppress some rpmlint warnings. + * Sat Jan 24 2009 Richard W.M. Jones - 43-6 - Don't claim C++ compiler exists if it's not installed, as this breaks autoconf and (in particular) libtool. diff --git a/mingw32-rpmlint.config b/mingw32-rpmlint.config new file mode 100644 index 0000000..b591c28 --- /dev/null +++ b/mingw32-rpmlint.config @@ -0,0 +1,19 @@ +# rpmlint overrides file. +# This file filters out MinGW warnings. +# See: http://fedoraproject.org/wiki/MinGW/Rpmlint + +# Unconditionally remove devel-file-in-non-devel rpmlint warning. +addFilter ("^mingw32-.*devel-file-in-non-devel") + +# /usr/i686-pc-mingw32 is permitted by MinGW packaging guidelines. +addFilter ("^mingw32-.*non-standard-dir-in-usr i686-pc-mingw32") + +# Permit *.la files (error is a bit odd, but it's what rpmlint prints). +addFilter ("^mingw32-.*script-without-shebang.*\.la$") + +# GCC and libtool create executable archive files. It's not clear +# why, but we permit this for now. +addFilter ("^mingw32-.*spurious-executable-perm.*\.dll\.a$") + +# *.dll.a files are permitted arch-independent objects. +addFilter ("^mingw32-.*arch-independent-package-contains-binary-or-object.*\.dll\.a$") From 853dfe46604afc9ad8d398a3a2daa89de7bf0be8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 30 Jan 2009 09:38:05 +0000 Subject: [PATCH 14/71] - Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig is never searched. --- mingw32-filesystem.spec | 6 +++++- mingw32-macros.mingw32 | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 21d9464..ca9105f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 44 +Version: 45 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 28 2009 Richard W.M. Jones - 45-1 +- Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig + is never searched. + * Mon Jan 26 2009 Richard W.M. Jones - 44-1 - Install rpmlint overrides file to suppress some rpmlint warnings. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index cbc05ca..5be5230 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -54,7 +54,7 @@ %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh %_mingw32_env HOST_CC=gcc; export HOST_CC; \ - PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \ + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \ From 2e732f340c07987345cb1ed6b41e527355b09393 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 1 Feb 2009 23:15:40 +0000 Subject: [PATCH 15/71] Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van Pienbroek). --- mingw32-filesystem.spec | 6 +++++- mingw32-macros.mingw32 | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index ca9105f..7bcb066 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 45 +Version: 46 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 1 2009 Richard W.M. Jones - 46-1 +- Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van + Pienbroek). + * Wed Jan 28 2009 Richard W.M. Jones - 45-1 - Use PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH so that native pkgconfig is never searched. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index 5be5230..58cc2b4 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -55,6 +55,7 @@ %_mingw32_env HOST_CC=gcc; export HOST_CC; \ PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \ From b8b00efeff5fb1be2a46b070d714017090598636 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 17 Feb 2009 08:37:27 +0000 Subject: [PATCH 16/71] - 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). --- mingw32-COPYING => COPYING | 0 mingw32-macros.mingw32 => macros.mingw32 | 6 +++++- mingw32-filesystem.spec | 12 ++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) rename mingw32-COPYING => COPYING (100%) rename mingw32-macros.mingw32 => macros.mingw32 (94%) diff --git a/mingw32-COPYING b/COPYING similarity index 100% rename from mingw32-COPYING rename to COPYING diff --git a/mingw32-macros.mingw32 b/macros.mingw32 similarity index 94% rename from mingw32-macros.mingw32 rename to macros.mingw32 index 58cc2b4..e27e4a5 100644 --- a/mingw32-macros.mingw32 +++ b/macros.mingw32 @@ -80,7 +80,8 @@ %_mingw32_configure %{_mingw32_env} ; \ - ./configure --cache-file=%{_mingw32_cache} \\\ + __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; + $__mingw32_topdir/configure --cache-file=%{_mingw32_cache} \\\ --host=%{_mingw32_host} \\\ --build=%_build \\\ --target=%{_mingw32_target} \\\ @@ -131,3 +132,6 @@ infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\ install +%_mingw32_description This is the cross-compiled version of this library / tool.\ +You should only install this package if you want to cross-compile programs for \ +Win32 (32 bit Windows). diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 7bcb066..d183f0b 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -11,8 +11,8 @@ URL: http://hg.et.redhat.com/misc/fedora-mingw--devel/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Source0: mingw32-COPYING -Source1: mingw32-macros.mingw32 +Source0: COPYING +Source1: macros.mingw32 Source2: mingw32.sh #Source3: mingw32.csh Source4: mingw32-find-requires.sh @@ -49,6 +49,7 @@ Provides: mingw32(user32.dll) Provides: mingw32(wldap32.dll) Provides: mingw32(glut32.dll) Provides: mingw32(secur32.dll) +Provides: mingw32(version.dll) %description @@ -153,6 +154,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 17 2009 Richard W.M. Jones - 47-1 +- 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). + * Sun Feb 1 2009 Richard W.M. Jones - 46-1 - Unset PKG_CONFIG_PATH because /usr/lib/rpm/macros sets it (Erik van Pienbroek). From 17b7226512030d92d5d507f1b5b1b27e7fa1cbe1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 17 Feb 2009 08:38:47 +0000 Subject: [PATCH 17/71] Increase version number. --- mingw32-filesystem.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index d183f0b..6570cee 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 46 +Version: 47 Release: 1%{?dist} Summary: MinGW base filesystem and environment From 3f88d628662035c4002b23b9e88a61d1b1b7a9ef Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 18 Feb 2009 17:06:07 +0000 Subject: [PATCH 18/71] Fix _mingw32_configure. --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index e27e4a5..d7200b8 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -80,7 +80,7 @@ %_mingw32_configure %{_mingw32_env} ; \ - __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; + __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ $__mingw32_topdir/configure --cache-file=%{_mingw32_cache} \\\ --host=%{_mingw32_host} \\\ --build=%_build \\\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 6570cee..6955029 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 47 +Version: 48 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 18 2009 Richard W.M. Jones - 48-1 +- Fix _mingw32_configure. + * Tue Feb 17 2009 Richard W.M. Jones - 47-1 - Rename mingw32-COPYING to COPYING. - Rename mingw32-macros.mingw32 to macros.mingw32. From da91edc8efb2936e24c48f41400237a0971d11b6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 19 Feb 2009 13:30:05 +0000 Subject: [PATCH 19/71] Added virtual provides for mingw32(cfgmgr32.dll) and mingw32(setupapi.dll). --- mingw32-filesystem.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 6955029..9836e7a 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 48 +Version: 49 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -50,6 +50,8 @@ Provides: mingw32(wldap32.dll) Provides: mingw32(glut32.dll) Provides: mingw32(secur32.dll) Provides: mingw32(version.dll) +Provides: mingw32(cfgmgr32.dll) +Provides: mingw32(setupapi.dll) %description @@ -154,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 19 2009 Richard W.M. Jones - 49-1 +- Added virtual provides for mingw32(cfgmgr32.dll) and mingw32(setupapi.dll). + * Wed Feb 18 2009 Richard W.M. Jones - 48-1 - Fix _mingw32_configure. From 5a16e31e206ad6b259f3c7f4f1e1d762fc554f8c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 20 Feb 2009 21:07:22 +0000 Subject: [PATCH 20/71] Rebuild for mingw32-gcc 4.4 --- mingw32-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 9836e7a..01bd847 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 49 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 20 2009 Richard W.M. Jones - 49-2 +- Rebuild for mingw32-gcc 4.4 + * Thu Feb 19 2009 Richard W.M. Jones - 49-1 - Added virtual provides for mingw32(cfgmgr32.dll) and mingw32(setupapi.dll). From 5f29aa3fbe5fea61f4d3b38073d5a53a09a4eeec Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 01:03:00 +0000 Subject: [PATCH 21/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- mingw32-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 01bd847..bc400e2 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 49 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -156,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 49-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 20 2009 Richard W.M. Jones - 49-2 - Rebuild for mingw32-gcc 4.4 From 7a18fb8141121a0c43787180f769ff2cff6a7d9a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 27 Mar 2009 09:20:25 +0000 Subject: [PATCH 22/71] - Fix up and test mingw32-pkg-config changes. Thu Mar 26 2009 Levente Farkas - 50-1 - Add mingw32-pkg-config. --- macros.mingw32 | 4 ++++ mingw32-filesystem.spec | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index d7200b8..d62b81e 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -78,6 +78,10 @@ done; \ unset x i +%_mingw32_pkg_config \ + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + unset PKG_CONFIG_PATH; \ + pkg-config %_mingw32_configure %{_mingw32_env} ; \ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index bc400e2..b0868c8 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 49 +Version: 50 Release: 3%{?dist} Summary: MinGW base filesystem and environment @@ -22,6 +22,7 @@ Source7: mingw32-rpmlint.config Requires: setup Requires: rpm +Requires: pkgconfig Requires: rpmlint >= 0.85-2 BuildRequires: rpmlint >= 0.85-2 @@ -83,7 +84,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make; do +for i in mingw32-configure mingw32-make mingw32-pkg-config; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -150,12 +151,19 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %{_bindir}/mingw32-configure %{_bindir}/mingw32-make +%{_bindir}/mingw32-pkg-config %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ /usr/lib/rpm/mingw32-* %changelog +* Fri Mar 27 2009 Richard W.M. Jones - 50-3 +- Fix up and test mingw32-pkg-config changes. + +* Thu Mar 26 2009 Levente Farkas - 50-1 +- Add mingw32-pkg-config. + * Wed Feb 25 2009 Fedora Release Engineering - 49-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From c6360f8b148c4c9629966d62031a617f53195101 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Apr 2009 22:25:57 +0000 Subject: [PATCH 23/71] Fix dependency problem with + in DLL name (Thomas Sailer). --- mingw32-filesystem.spec | 5 ++++- mingw32-find-requires.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index b0868c8..84a687f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 50 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 21 2009 Richard W.M. Jones - 50-4 +- Fix dependency problem with + in DLL name (Thomas Sailer). + * Fri Mar 27 2009 Richard W.M. Jones - 50-3 - Fix up and test mingw32-pkg-config changes. diff --git a/mingw32-find-requires.sh b/mingw32-find-requires.sh index ff8bb39..9d93388 100755 --- a/mingw32-find-requires.sh +++ b/mingw32-find-requires.sh @@ -22,7 +22,7 @@ echo 'mingw32-runtime' dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') for f in $dlls; do - $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' | + $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' | tr [:upper:] [:lower:] | sed 's/\(.*\)/mingw32(\1)/' done | sort -u From 7cf0edd56afed68bb97fff24d3560eca0b274009 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jun 2009 08:44:18 +0000 Subject: [PATCH 24/71] Add CMake rules (Adam Goode) --- Toolchain-mingw32.cmake | 14 ++++++++++++++ macros.mingw32 | 14 ++++++++++++++ mingw32-filesystem.spec | 15 ++++++++++++--- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 Toolchain-mingw32.cmake diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake new file mode 100644 index 0000000..a9234c5 --- /dev/null +++ b/Toolchain-mingw32.cmake @@ -0,0 +1,14 @@ +SET(CMAKE_SYSTEM_NAME Windows) + +# specify the cross compiler +SET(CMAKE_C_COMPILER /usr/bin/i686-pc-mingw32-gcc) +SET(CMAKE_CXX_COMPILER /usr/bin/i686-pc-mingw32-g++) + +# where is the target environment +SET(CMAKE_FIND_ROOT_PATH /usr/i686-pc-mingw32/sys-root/mingw) + +# search for programs in the build host directories +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +# for libraries and headers in the target directories +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/macros.mingw32 b/macros.mingw32 index d62b81e..6a257fd 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -136,6 +136,20 @@ infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\ install +%_mingw32_cmake %{_mingw32_env} ; \ + %__cmake \\\ + -DCMAKE_VERBOSE_MAKEFILE=ON \\\ + -DCMAKE_INSTALL_PREFIX:PATH=%{_mingw32_prefix} \\\ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_mingw32_libdir} \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_mingw32_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_mingw32_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_mingw32_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_mingw32_datadir} \\\ + %{?_cmake_skip_rpath} \\\ + -DBUILD_SHARED_LIBS:BOOL=ON \\\ + -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw32/Toolchain-mingw32.cmake + + %_mingw32_description This is the cross-compiled version of this library / tool.\ You should only install this package if you want to cross-compile programs for \ Win32 (32 bit Windows). diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 84a687f..d31c8df 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 50 -Release: 4%{?dist} +Version: 51 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -19,6 +19,7 @@ Source4: mingw32-find-requires.sh Source5: mingw32-find-provides.sh Source6: mingw32-scripts.sh Source7: mingw32-rpmlint.config +Source8: Toolchain-mingw32.cmake Requires: setup Requires: rpm @@ -84,7 +85,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config; do +for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -137,6 +138,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm +mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw32 +install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 + %clean rm -rf $RPM_BUILD_ROOT @@ -152,12 +156,17 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mingw32-configure %{_bindir}/mingw32-make %{_bindir}/mingw32-pkg-config +%{_bindir}/mingw32-cmake %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ +%{_datadir}/mingw32 /usr/lib/rpm/mingw32-* %changelog +* Thu Jun 4 2009 Adam Goode - 51-1 +- Add CMake rules + * Tue Apr 21 2009 Richard W.M. Jones - 50-4 - Fix dependency problem with + in DLL name (Thomas Sailer). From d9bad00f487fddc4d476d05bcafecfdbb67594d1 Mon Sep 17 00:00:00 2001 From: epienbro Date: Mon, 22 Jun 2009 10:18:35 +0000 Subject: [PATCH 25/71] - 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} --- macros.mingw32 | 18 ++++++++++++++++++ mingw32-filesystem.spec | 12 ++++++++++-- mingw32-find-debuginfo.sh | 31 +++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100755 mingw32-find-debuginfo.sh diff --git a/macros.mingw32 b/macros.mingw32 index 6a257fd..27ac79e 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -52,6 +52,24 @@ %_mingw32_findprovides /usr/lib/rpm/mingw32-find-provides.sh %_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh +%_mingw32_finddebuginfo /usr/lib/rpm/mingw32-find-debuginfo.sh + +%_mingw32_debug_install_post \ + /usr/lib/rpm/mingw32-find-debuginfo.sh %{_builddir}/%{?buildsubdir}\ +%{nil} + +# Template for debug sub-package. +%_mingw32_debug_package(n:) \ +%package %{-n:-n %{-n*}-}debuginfo \ +Summary: Debug information for package %{name} \ +Group: Development/debug \ +%description %{-n:-n %{-n*}-}debuginfo \ +This package provides debug information for package %{name}.\ +Debug information is useful when developing applications that use this\ +package or when debugging this package.\ +%files debuginfo -f debugfiles.list\ +%defattr(-,root,root,-)\ +%{nil} %_mingw32_env HOST_CC=gcc; export HOST_CC; \ PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index d31c8df..49669e8 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 51 +Version: 52 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -20,6 +20,7 @@ Source5: mingw32-find-provides.sh Source6: mingw32-scripts.sh Source7: mingw32-rpmlint.config Source8: Toolchain-mingw32.cmake +Source9: mingw32-find-debuginfo.sh Requires: setup Requires: rpm @@ -137,11 +138,11 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{ mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/rpm mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw32 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 - %clean rm -rf $RPM_BUILD_ROOT @@ -164,6 +165,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 22 2009 Erik van Pienbroek - 52-0 +- 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} + * Thu Jun 4 2009 Adam Goode - 51-1 - Add CMake rules diff --git a/mingw32-find-debuginfo.sh b/mingw32-find-debuginfo.sh new file mode 100755 index 0000000..7758058 --- /dev/null +++ b/mingw32-find-debuginfo.sh @@ -0,0 +1,31 @@ +#!/bin/sh +#mingw32_find-debuginfo.sh - automagically generate debug info and file list +#for inclusion in an rpm spec file for mingw32-* packages. + +if [ -z "$1" ] ; then BUILDDIR="." +else BUILDDIR=$1 +fi + +for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll"` +do + case $(i686-pc-mingw32-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in + *debuglink*) continue ;; + *debug*) ;; + *gnu.version*) + echo "WARNING: "`echo $f | sed -e "s,^$RPM_BUILD_ROOT/*,/,"`" is already stripped!" + continue + ;; + *) continue ;; + esac + + echo extracting debug info from $f + i686-pc-mingw32-objcopy --only-keep-debug $f $f.debug || : + pushd `dirname $f` + i686-pc-mingw32-objcopy --add-gnu-debuglink=`basename $f.debug` --strip-unneeded `basename $f` || : + popd +done + +find $RPM_BUILD_ROOT -type f -name "*.exe.debug" -or -name "*.dll.debug" | + sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/debugfiles.list + + From c95a721510ad9a3f461d43564864ef5b7fd7d953 Mon Sep 17 00:00:00 2001 From: epienbro Date: Wed, 24 Jun 2009 17:27:24 +0000 Subject: [PATCH 26/71] Updated ChangeLog comment from previous version as the RPM variable __debug_install_post needs to be overridden instead of __os_install_post for -debuginfo subpackage generation --- mingw32-filesystem.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 49669e8..5e51a42 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 52 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -165,11 +165,16 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Jun 22 2009 Erik van Pienbroek - 52-0 +* Wed Jun 24 2009 Erik van Pienbroek - 52-2 +- Updated ChangeLog comment from previous version as the RPM variable + __debug_install_post needs to be overridden instead of __os_install_post + for -debuginfo subpackage generation + +* Mon Jun 22 2009 Erik van Pienbroek - 52-1 - 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} + %%define __debug_install_post %%{_mingw32_debug_install_post} %%{_mingw32_debug_package} * Thu Jun 4 2009 Adam Goode - 51-1 From ad998c675c36744b169e54c0fcd725923f5375aa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 12:16:43 +0000 Subject: [PATCH 27/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- mingw32-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 5e51a42..118e2ff 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 52 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 52-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Jun 24 2009 Erik van Pienbroek - 52-2 - Updated ChangeLog comment from previous version as the RPM variable __debug_install_post needs to be overridden instead of __os_install_post From dc67d0699c8a0daf73626ccff12ad51537230d0f Mon Sep 17 00:00:00 2001 From: epienbro Date: Sun, 23 Aug 2009 18:50:36 +0000 Subject: [PATCH 28/71] Fixed a small rpmlint warning caused by the debuginfo generation macro Thanks to Kalev Lember for spotting this --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 27ac79e..3f6a99d 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -62,7 +62,7 @@ %_mingw32_debug_package(n:) \ %package %{-n:-n %{-n*}-}debuginfo \ Summary: Debug information for package %{name} \ -Group: Development/debug \ +Group: Development/Debug \ %description %{-n:-n %{-n*}-}debuginfo \ This package provides debug information for package %{name}.\ Debug information is useful when developing applications that use this\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 118e2ff..7781afa 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 52 -Release: 3%{?dist} +Version: 53 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -165,6 +165,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 23 2009 Erik van Pienbroek - 53-1 +- Fixed a small rpmlint warning caused by the debuginfo generation macro + Thanks to Kalev Lember for spotting this + * Sat Jul 25 2009 Fedora Release Engineering - 52-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 3dbb3430d65499487bcf8d5ab6d10859f729ebb8 Mon Sep 17 00:00:00 2001 From: epienbro Date: Sat, 29 Aug 2009 14:35:44 +0000 Subject: [PATCH 29/71] - Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script which calls pkg-config with the right environment variables set (BZ #513825) --- mingw32-filesystem.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 7781afa..f7e8458 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 53 +Version: 54 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -86,7 +86,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake; do +for i in mingw32-configure mingw32-make mingw32-pkg-config %{_mingw32_target}-pkg-config mingw32-cmake; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -157,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mingw32-configure %{_bindir}/mingw32-make %{_bindir}/mingw32-pkg-config +%{_bindir}/%{_mingw32_target}-pkg-config %{_bindir}/mingw32-cmake %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ @@ -165,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 29 2009 Erik van Pienbroek - 54-1 +- Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script + which calls pkg-config with the right environment variables set (BZ #513825) + * Sun Aug 23 2009 Erik van Pienbroek - 53-1 - Fixed a small rpmlint warning caused by the debuginfo generation macro Thanks to Kalev Lember for spotting this From b136c92f8318a234661bddd7be013eea70d77a12 Mon Sep 17 00:00:00 2001 From: epienbro Date: Sat, 29 Aug 2009 14:40:08 +0000 Subject: [PATCH 30/71] Somehow this change wasn't sent along with the previous commit.. --- mingw32-scripts.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-scripts.sh b/mingw32-scripts.sh index 24af47a..adc1e95 100755 --- a/mingw32-scripts.sh +++ b/mingw32-scripts.sh @@ -21,5 +21,9 @@ # This is a useful command-line script through which one can use the # macros from mingw32-macros.mingw32 cross-compilation. -NAME="_`basename $0|tr -- - _`" +if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then + NAME="_mingw32_pkg_config" +else + NAME="_`basename $0|tr -- - _`" +fi eval "`rpm --eval "%{$NAME}"`" "$@" From 5051797059ec6da8ca0509f098922dfd68efe812 Mon Sep 17 00:00:00 2001 From: epienbro Date: Tue, 1 Sep 2009 21:42:50 +0000 Subject: [PATCH 31/71] - The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config, mingw32-configure, mingw32-make and mingw32-cmake had a bug where quoted arguments could get interpreted incorrect. Thanks to Michael Ploujnikov for helping out with this issue --- mingw32-filesystem.spec | 8 +++++++- mingw32-scripts.sh | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index f7e8458..4cc2959 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 54 +Version: 55 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -166,6 +166,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 1 2009 Erik van Pienbroek - 55-1 +- The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config, + mingw32-configure, mingw32-make and mingw32-cmake had a bug where + quoted arguments could get interpreted incorrect. + Thanks to Michael Ploujnikov for helping out with this issue + * Sat Aug 29 2009 Erik van Pienbroek - 54-1 - Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script which calls pkg-config with the right environment variables set (BZ #513825) diff --git a/mingw32-scripts.sh b/mingw32-scripts.sh index adc1e95..f068e0a 100755 --- a/mingw32-scripts.sh +++ b/mingw32-scripts.sh @@ -26,4 +26,8 @@ if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then else NAME="_`basename $0|tr -- - _`" fi -eval "`rpm --eval "%{$NAME}"`" "$@" + +# NOTE: The use of 'eval' in combination with '$@' is a potential security risk +# We should find a more safe replacement for this command +# Suggestions are welcome at the Fedora MinGW mailing list +eval "`rpm --eval "%{$NAME}"`" '"$@"' From 8bb36e0c74cc9789fedf5f3dce77375d3c1d4633 Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 18 Sep 2009 21:34:17 +0000 Subject: [PATCH 32/71] Prevented a circular dependency which caused the i686-pc-mingw32-pkg-config script to be broken. Thanks to Kalev Lember for spotting this bug --- mingw32-filesystem.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 4cc2959..85f38bd 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 55 +Version: 56 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -86,7 +86,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config %{_mingw32_target}-pkg-config mingw32-cmake; do +for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -157,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mingw32-configure %{_bindir}/mingw32-make %{_bindir}/mingw32-pkg-config -%{_bindir}/%{_mingw32_target}-pkg-config +%{_bindir}/i686-pc-mingw32-pkg-config %{_bindir}/mingw32-cmake %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ @@ -166,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 18 2009 Erik van Pienbroek - 55-1 - The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config, mingw32-configure, mingw32-make and mingw32-cmake had a bug where From 61e147418dab02a6e56ec65f56c6a642168ba923 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:18:47 +0000 Subject: [PATCH 33/71] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b03da0..4e84b8b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := mingw32-filesystem SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 144b0e9c04ad4c3d44e043ba9de06a39ebadca3a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 24 May 2010 09:39:19 +0000 Subject: [PATCH 34/71] Work around cmake's Qt detection in the toolchain file --- Toolchain-mingw32.cmake | 5 +++++ mingw32-filesystem.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index a9234c5..8345ecf 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -12,3 +12,8 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # for libraries and headers in the target directories SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# FindQt4.cmake queries qmake to get information, +# which doesn't work when crosscompiling +SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) +SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 85f38bd..e07f851 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 56 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -166,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 24 2010 Kalev Lember - 56-2 +- Work around cmake's Qt detection in the toolchain file + * Fri Sep 18 2009 Erik van Pienbroek Date: Tue, 8 Jun 2010 13:17:52 +0000 Subject: [PATCH 35/71] Add provides mingw32(rpcrt4.dll) (RHBZ#594581). --- mingw32-filesystem.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index e07f851..d0ec163 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 56 -Release: 2%{?dist} +Version: 57 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -55,6 +55,7 @@ Provides: mingw32(secur32.dll) Provides: mingw32(version.dll) Provides: mingw32(cfgmgr32.dll) Provides: mingw32(setupapi.dll) +Provides: mingw32(rpcrt4.dll) %description @@ -166,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 8 2010 Richard W.M. Jones - 57-1 +- Add provides mingw32(rpcrt4.dll) (RHBZ#594581). + * Mon May 24 2010 Kalev Lember - 56-2 - Work around cmake's Qt detection in the toolchain file From cf660b2b316c53101f7490fb1086b0283a6e05e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:19:10 +0000 Subject: [PATCH 36/71] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4e84b8b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mingw32-filesystem -# $Id$ -NAME := mingw32-filesystem -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From d8bcc2f5ac2ba0cde140fe0682286dfaf5c2a2fb Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 3 Sep 2010 11:53:26 +0100 Subject: [PATCH 37/71] Remove requires setup and rpm (RHBZ#629791). I checked back in the history, and these were inherited from the first time we created this package: http://git.annexia.org/?p=fedora-mingw.git;a=commitdiff;h=337c0675f1f1f8aa46b4ef166954b48eb8e3fe75 --- mingw32-filesystem.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index d0ec163..df5058f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 57 +Version: 58 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -22,8 +22,6 @@ Source7: mingw32-rpmlint.config Source8: Toolchain-mingw32.cmake Source9: mingw32-find-debuginfo.sh -Requires: setup -Requires: rpm Requires: pkgconfig Requires: rpmlint >= 0.85-2 @@ -167,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 3 2010 Richard W.M. Jones - 58-1 +- Remove requires setup and rpm (RHBZ#629791). + * Tue Jun 8 2010 Richard W.M. Jones - 57-1 - Add provides mingw32(rpcrt4.dll) (RHBZ#594581). From 7034ac899f074b4bed02090fb271ecb10d7266fb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 6 Sep 2010 15:28:17 +0300 Subject: [PATCH 38/71] Own /etc/rpmlint/ dir instead of depending on rpmlint package (RHBZ#629791) --- mingw32-filesystem.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index df5058f..2194ec3 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 58 +Version: 59 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -23,9 +23,6 @@ Source8: Toolchain-mingw32.cmake Source9: mingw32-find-debuginfo.sh Requires: pkgconfig -Requires: rpmlint >= 0.85-2 - -BuildRequires: rpmlint >= 0.85-2 # Note about 'Provides: mingw32(foo.dll)' # ------------------------------------------------------------ @@ -152,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh +%dir %{_sysconfdir}/rpmlint %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %{_bindir}/mingw32-configure %{_bindir}/mingw32-make @@ -165,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 06 2010 Kalev Lember - 59-1 +- Own /etc/rpmlint/ dir instead of depending on rpmlint package (RHBZ#629791) + * Fri Sep 3 2010 Richard W.M. Jones - 58-1 - Remove requires setup and rpm (RHBZ#629791). From 9844c015469065a13ec694ff21172c1570d63f44 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 9 Sep 2010 13:35:15 +0100 Subject: [PATCH 39/71] Provide virtual mingw32(ws2_32.dll) for libvirt. --- mingw32-filesystem.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 2194ec3..98a8ba3 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 59 +Version: 60 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -51,6 +51,7 @@ Provides: mingw32(version.dll) Provides: mingw32(cfgmgr32.dll) Provides: mingw32(setupapi.dll) Provides: mingw32(rpcrt4.dll) +Provides: mingw32(ws2_32.dll) %description @@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Sep 9 2010 Richard W.M. Jones - 60-1 +- Provide virtual mingw32(ws2_32.dll) for libvirt. + * Mon Sep 06 2010 Kalev Lember - 59-1 - Own /etc/rpmlint/ dir instead of depending on rpmlint package (RHBZ#629791) From 3eb87c918e3e94caaffcd519c167ff9dc7c039b2 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 12 Sep 2010 17:59:51 +0200 Subject: [PATCH 40/71] Provide mingw32(gdiplus.dll) for gdk-pixbuf --- mingw32-filesystem.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 98a8ba3..6e3eb88 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 60 +Version: 61 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -52,6 +52,7 @@ Provides: mingw32(cfgmgr32.dll) Provides: mingw32(setupapi.dll) Provides: mingw32(rpcrt4.dll) Provides: mingw32(ws2_32.dll) +Provides: mingw32(gdiplus.dll) %description @@ -164,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 12 2010 Erik van Pienbroek - 61-1 +- Provide mingw32(gdiplus.dll) for gdk-pixbuf + * Thu Sep 9 2010 Richard W.M. Jones - 60-1 - Provide virtual mingw32(ws2_32.dll) for libvirt. From bd51a55b1a886be7480dc4b07a3c103056b815a0 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Mon, 11 Oct 2010 20:41:36 +0200 Subject: [PATCH 41/71] Provide mingw32(odbc32.dll) for Qt --- mingw32-filesystem.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 6e3eb88..2c01f24 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 61 +Version: 62 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -53,6 +53,7 @@ Provides: mingw32(setupapi.dll) Provides: mingw32(rpcrt4.dll) Provides: mingw32(ws2_32.dll) Provides: mingw32(gdiplus.dll) +Provides: mingw32(odbc32.dll) %description @@ -165,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 11 2010 Erik van Pienbroek - 62-1 +- Provide mingw32(odbc32.dll) for Qt + * Sun Sep 12 2010 Erik van Pienbroek - 61-1 - Provide mingw32(gdiplus.dll) for gdk-pixbuf From a921aa1836d721cb7e51bb079f59041c01b3757a Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Tue, 19 Oct 2010 23:37:10 +0600 Subject: [PATCH 42/71] Added mingw32-qmake-qt4 --- macros.mingw32 | 2 ++ mingw32-filesystem.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 3f6a99d..9e64e39 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -167,6 +167,8 @@ package or when debugging this package.\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw32/Toolchain-mingw32.cmake +%_mingw32_qmake_qt4 %{_mingw32_env} ; \ + %_qt4_qmake -win32 -spec fedora-win32-cross %_mingw32_description This is the cross-compiled version of this library / tool.\ You should only install this package if you want to cross-compile programs for \ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 2c01f24..c21fcc2 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 62 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -85,7 +85,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake; do +for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -159,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mingw32-pkg-config %{_bindir}/i686-pc-mingw32-pkg-config %{_bindir}/mingw32-cmake +%{_bindir}/mingw32-qmake-qt4 %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ %{_datadir}/mingw32 @@ -166,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 19 2010 Ivan Romanov - 62-2 +- Added mingw32-qmake-qt4 + * Mon Oct 11 2010 Erik van Pienbroek - 62-1 - Provide mingw32(odbc32.dll) for Qt From dd7c74f479edbe603445510ecf767b94722d2424 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Thu, 11 Nov 2010 23:39:31 +0100 Subject: [PATCH 43/71] Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435) --- Toolchain-mingw32.cmake | 4 ++++ mingw32-filesystem.spec | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 8345ecf..d80988d 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -17,3 +17,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # which doesn't work when crosscompiling SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include) SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) + +# set the resource compiler (RHBZ #652435) +SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) + diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index c21fcc2..61889bd 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 62 -Release: 2%{?dist} +Version: 63 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -167,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 11 2010 Erik van Pienbroek - 63-1 +- Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435) + * Tue Oct 19 2010 Ivan Romanov - 62-2 - Added mingw32-qmake-qt4 From 97e2f31e916c7bcc0a208cedb7211423d37a7afb Mon Sep 17 00:00:00 2001 From: Ivan Romanov Date: Sun, 14 Nov 2010 15:08:36 +0500 Subject: [PATCH 44/71] Removed -win32 option and fixed -spec option for mingw32-qmake-qt4 --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 9e64e39..aa75be7 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -168,7 +168,7 @@ package or when debugging this package.\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw32/Toolchain-mingw32.cmake %_mingw32_qmake_qt4 %{_mingw32_env} ; \ - %_qt4_qmake -win32 -spec fedora-win32-cross + %_qt4_qmake -spec win32-g++-fedora-cross %_mingw32_description This is the cross-compiled version of this library / tool.\ You should only install this package if you want to cross-compile programs for \ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 61889bd..4fe0847 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 63 +Version: 64 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -167,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 14 2010 Ivan Romanov 64-1 +- Removed -win32 option for mingw32-qmake-qt4 (is obsoletes since qt version 4.7.0) +- Using win32-g++-fedora-cross instead fedora-win32-cross spec file + * Thu Nov 11 2010 Erik van Pienbroek - 63-1 - Set the CMAKE_RC_COMPILER variable in the CMake toolchain file (RHBZ #652435) From 1dddd1ea0c817d1f1dd7bd4e18d187e6ec929126 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 12 Jan 2011 16:11:42 +0100 Subject: [PATCH 45/71] Own the directory %{_mingw32_datadir}/themes --- mingw32-filesystem.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 4fe0847..4499947 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 64 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -132,6 +132,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/info mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man{1,2,3,4,5,6,7,8,l,n} +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/themes # NB. NOT _libdir mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm @@ -167,7 +168,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Nov 14 2010 Ivan Romanov 64-1 +* Wed Jan 12 2011 Erik van Pienbroek - 64-2 +- Own the directory %%{_mingw32_datadir}/themes + +* Sun Nov 14 2010 Ivan Romanov - 64-1 - Removed -win32 option for mingw32-qmake-qt4 (is obsoletes since qt version 4.7.0) - Using win32-g++-fedora-cross instead fedora-win32-cross spec file From 36b5a23ed227e85fc93fd88be5bd7f8f4f2be04e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 12:27:19 -0600 Subject: [PATCH 46/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- mingw32-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 4499947..c420125 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 64 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 64-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jan 12 2011 Erik van Pienbroek - 64-2 - Own the directory %%{_mingw32_datadir}/themes From 5b66efd7edd41be17b8bd7eb7d4a8a6d472e2089 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 17 Mar 2011 15:11:52 +0200 Subject: [PATCH 47/71] Don't error out trying to set illegal LD.BFD variable name --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index aa75be7..f349740 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -76,7 +76,7 @@ package or when debugging this package.\ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ - x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-" "A-ZX_"`; \ + x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-." "A-ZX__"`; \ declare -x $x="$i" ; export $x; \ done; \ unset _PREFIX; \ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index c420125..b5fceb7 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 64 -Release: 3%{?dist} +Version: 65 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 17 2011 Kalev Lember - 65-1 +- Don't error out trying to set illegal LD.BFD variable name + * Tue Feb 08 2011 Fedora Release Engineering - 64-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From a3f272c1d2685e125a320117be4a7c3a1c543aa6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 1 May 2011 11:22:31 +0300 Subject: [PATCH 48/71] Override boost library suffix in cmake toolchain file --- Toolchain-mingw32.cmake | 2 ++ mingw32-filesystem.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index d80988d..6c9c932 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -21,3 +21,5 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) # set the resource compiler (RHBZ #652435) SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) +# override boost library suffix which defaults to -mgw +SET(Boost_COMPILER -gcc45) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index b5fceb7..c02e5fd 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 65 +Version: 66 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 01 2011 Kalev Lember - 66-1 +- Override boost library suffix in cmake toolchain file + * Thu Mar 17 2011 Kalev Lember - 65-1 - Don't error out trying to set illegal LD.BFD variable name From 2c67134589cbb8f8d42ddfca680582b66308ec3b Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sat, 14 May 2011 14:07:09 +0200 Subject: [PATCH 49/71] Don't unset PKG_CONFIG_PATH in the wrapper scripts mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171) --- macros.mingw32 | 4 +--- mingw32-filesystem.spec | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index f349740..ac86bab 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -97,9 +97,7 @@ package or when debugging this package.\ unset x i %_mingw32_pkg_config \ - PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ - unset PKG_CONFIG_PATH; \ - pkg-config + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig" pkg-config %_mingw32_configure %{_mingw32_env} ; \ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index c02e5fd..5411573 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 66 +Version: 67 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -168,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat May 14 2011 Erik van Pienbroek - 67-1 +- Don't unset PKG_CONFIG_PATH in the wrapper scripts + mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171) + * Sun May 01 2011 Kalev Lember - 66-1 - Override boost library suffix in cmake toolchain file From b4298c0ccc855b3dbd8c109eb21ed19a5b82f0e7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 20 May 2011 13:27:53 +0300 Subject: [PATCH 50/71] Support RPM 4.9 new "fileattr" dep extraction system --- mingw32-filesystem.spec | 10 +++++++++- mingw32.attr | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 mingw32.attr diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 5411573..54afefa 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 67 +Version: 68 Release: 1%{?dist} Summary: MinGW base filesystem and environment @@ -21,6 +21,7 @@ Source6: mingw32-scripts.sh Source7: mingw32-rpmlint.config Source8: Toolchain-mingw32.cmake Source9: mingw32-find-debuginfo.sh +Source10: mingw32.attr Requires: pkgconfig @@ -140,6 +141,9 @@ install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/rpm +mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs +install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs/ + mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw32 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 @@ -165,9 +169,13 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/i686-pc-mingw32/ %{_datadir}/mingw32 /usr/lib/rpm/mingw32-* +/usr/lib/rpm/fileattrs/mingw32.attr %changelog +* Fri May 20 2011 Kalev Lember - 68-1 +- Support RPM 4.9 new "fileattr" dep extraction system + * Sat May 14 2011 Erik van Pienbroek - 67-1 - Don't unset PKG_CONFIG_PATH in the wrapper scripts mingw32-pkg-config and i686-pc-mingw32-pkg-config (BZ #688171) diff --git a/mingw32.attr b/mingw32.attr new file mode 100644 index 0000000..fa9251a --- /dev/null +++ b/mingw32.attr @@ -0,0 +1,3 @@ +%__mingw32_provides %{_rpmconfigdir}/mingw32-find-provides.sh +%__mingw32_requires %{_rpmconfigdir}/mingw32-find-requires.sh +%__mingw32_path ^%{_mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$ From 11c4c8fba587396ef960ca6fd8a4dedab6294e48 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 20 May 2011 13:30:59 +0300 Subject: [PATCH 51/71] Cleaned up the spec file from cruft not needed with latest rpm --- mingw32-filesystem.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 54afefa..dab8866 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -8,7 +8,6 @@ Summary: MinGW base filesystem and environment Group: Development/Libraries License: GPLv2+ URL: http://hg.et.redhat.com/misc/fedora-mingw--devel/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source0: COPYING @@ -77,8 +76,6 @@ sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh %install -rm -rf $RPM_BUILD_ROOT - mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libexecdir} @@ -147,12 +144,8 @@ install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/mingw32 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %doc COPYING %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32 %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh @@ -175,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri May 20 2011 Kalev Lember - 68-1 - Support RPM 4.9 new "fileattr" dep extraction system +- Cleaned up the spec file from cruft not needed with latest rpm * Sat May 14 2011 Erik van Pienbroek - 67-1 - Don't unset PKG_CONFIG_PATH in the wrapper scripts From 2de8bb604b4ffd190b9f7d2f3a02bbc25c93b0e0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 20 May 2011 14:07:16 +0300 Subject: [PATCH 52/71] Generate versionless mingw32-filesystem Requires The automatically generated Requires were too strict, making every binary rpm depend on the very latest mingw32-filesystem. For almost all packages any mingw32-filesystem from Fedora repos is sufficient. Using versionless mingw32-filesystem Requires avoids the situation where e.g. downgrading mingw32-filesystem would be impossible due to other packages needlessly depending on it. --- mingw32-filesystem.spec | 4 ++-- mingw32-find-requires.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index dab8866..076bcb1 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -68,7 +68,6 @@ This environment is maintained by the Fedora MinGW SIG at: %prep %setup -q -c -T cp %{SOURCE0} COPYING -sed 's/@VERSION@/%{version}/' < %{SOURCE4} > mingw32-find-requires.sh %build @@ -134,7 +133,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/themes # NB. NOT _libdir mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm -install -m 0755 mingw32-find-requires.sh $RPM_BUILD_ROOT/usr/lib/rpm +install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm install -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/rpm @@ -169,6 +168,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 * Fri May 20 2011 Kalev Lember - 68-1 - Support RPM 4.9 new "fileattr" dep extraction system - Cleaned up the spec file from cruft not needed with latest rpm +- Generate versionless mingw32-filesystem Requires * Sat May 14 2011 Erik van Pienbroek - 67-1 - Don't unset PKG_CONFIG_PATH in the wrapper scripts diff --git a/mingw32-find-requires.sh b/mingw32-find-requires.sh index 9d93388..ae1047e 100755 --- a/mingw32-find-requires.sh +++ b/mingw32-find-requires.sh @@ -14,9 +14,8 @@ fi filelist=`sed "s/['\"]/\\\&/g"` -# Everything requires mingw32-filesystem of at least the current version -# and mingw32-runtime. -echo 'mingw32-filesystem >= @VERSION@' +# Everything requires mingw32-filesystem and mingw32-runtime. +echo 'mingw32-filesystem' echo 'mingw32-runtime' dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') From 750c540bd01e27a7e677e352680b00e0bf853f80 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 21 May 2011 12:12:05 +0300 Subject: [PATCH 53/71] Own the _mingw32_datadir/cmake/ directory --- mingw32-filesystem.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 076bcb1..f9ed43c 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 68 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -115,6 +115,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/cmake # We don't normally package manual pages and info files, except # where those are not supplied by a Fedora native package. So we @@ -165,6 +166,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Sat May 21 2011 Kalev Lember - 68-2 +- Own the _mingw32_datadir/cmake/ directory + * Fri May 20 2011 Kalev Lember - 68-1 - Support RPM 4.9 new "fileattr" dep extraction system - Cleaned up the spec file from cruft not needed with latest rpm From e9ebc7111d44c2a9479c405971208fcb0a2c85ce Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 23 May 2011 06:24:48 +0300 Subject: [PATCH 54/71] Own etc/, share/pkgconfig/, share/xml/ directories --- mingw32-filesystem.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index f9ed43c..7fed193 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 68 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -109,6 +109,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/lib # and Windows-specific header files, pkgconfig, etc. mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/etc mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/sys mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib @@ -116,6 +117,8 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/cmake +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/pkgconfig +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/xml # We don't normally package manual pages and info files, except # where those are not supplied by a Fedora native package. So we @@ -166,6 +169,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Mon May 23 2011 Kalev Lember - 68-3 +- Own etc/, share/pkgconfig/, share/xml/ directories + * Sat May 21 2011 Kalev Lember - 68-2 - Own the _mingw32_datadir/cmake/ directory From 9781763c8bcd25f3d21c3a6bcaa67de146309c89 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 May 2011 10:50:37 +0300 Subject: [PATCH 55/71] 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. --- macros.mingw32 | 4 ++-- mingw32-filesystem.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index ac86bab..c89cd7e 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -72,7 +72,7 @@ package or when debugging this package.\ %{nil} %_mingw32_env HOST_CC=gcc; export HOST_CC; \ - PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{_mingw32_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ @@ -97,7 +97,7 @@ package or when debugging this package.\ unset x i %_mingw32_pkg_config \ - PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig" pkg-config + PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig" pkg-config %_mingw32_configure %{_mingw32_env} ; \ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 7fed193..3f705ec 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 68 -Release: 3%{?dist} +Version: 69 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -169,6 +169,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue May 24 2011 Kalev Lember - 69-1 +- Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/ + * Mon May 23 2011 Kalev Lember - 68-3 - Own etc/, share/pkgconfig/, share/xml/ directories From 15eccffbcb3c3e3603679f944b939ab1dbeff5e4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 May 2011 10:53:48 +0300 Subject: [PATCH 56/71] Own the sbin/ directory --- mingw32-filesystem.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 3f705ec..d6f205b 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -114,6 +114,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/sys mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig +mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/sbin mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/cmake @@ -171,6 +172,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog * Tue May 24 2011 Kalev Lember - 69-1 - Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/ +- Own the sbin/ directory * Mon May 23 2011 Kalev Lember - 68-3 - Own etc/, share/pkgconfig/, share/xml/ directories From 82ecebcd825286860b073a6a35e10bee1c092ea6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 May 2011 10:54:33 +0300 Subject: [PATCH 57/71] 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 --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/macros.mingw32 b/macros.mingw32 index c89cd7e..8bc6bbe 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -67,7 +67,7 @@ Group: Development/Debug \ This package provides debug information for package %{name}.\ Debug information is useful when developing applications that use this\ package or when debugging this package.\ -%files debuginfo -f debugfiles.list\ +%files %{-n:-n %{-n*}-}debuginfo -f debugfiles.list\ %defattr(-,root,root,-)\ %{nil} diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index d6f205b..c33cf14 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -173,6 +173,7 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 * Tue May 24 2011 Kalev Lember - 69-1 - Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/ - Own the sbin/ directory +- Fixed the -n option with _mingw32_debug_package macro * Mon May 23 2011 Kalev Lember - 68-3 - Own etc/, share/pkgconfig/, share/xml/ directories From 74761330f7a14298bf52731aad9d40f70f1682b0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 29 May 2011 17:17:44 +0300 Subject: [PATCH 58/71] 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 --- macros.mingw32 | 11 +++++++---- mingw32-filesystem.spec | 6 +++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 8bc6bbe..19ce4b8 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -1,5 +1,7 @@ # RPM macros for Fedora MinGW. +%_mingw32_pkg_name %(echo %{name} | sed 's/^mingw-/mingw32-/') + %_mingw32_target i686-pc-mingw32 # Paths. @@ -60,14 +62,15 @@ # Template for debug sub-package. %_mingw32_debug_package(n:) \ -%package %{-n:-n %{-n*}-}debuginfo \ +%define __mingw32_debug_pkg_name %{-n*}%{!-n:%{_mingw32_pkg_name}}-debuginfo \ +%package -n %{__mingw32_debug_pkg_name} \ Summary: Debug information for package %{name} \ Group: Development/Debug \ -%description %{-n:-n %{-n*}-}debuginfo \ -This package provides debug information for package %{name}.\ +%description -n %{__mingw32_debug_pkg_name} \ +This package provides debug information for package %{_mingw32_pkg_name}.\ Debug information is useful when developing applications that use this\ package or when debugging this package.\ -%files %{-n:-n %{-n*}-}debuginfo -f debugfiles.list\ +%files -n %{__mingw32_debug_pkg_name} -f debugfiles.list\ %defattr(-,root,root,-)\ %{nil} diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index c33cf14..3b711eb 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -170,6 +170,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Sun May 29 2011 Kalev Lember - 69-2 +- Make sure the -debuginfo subpackages are mingw32- prefixed + even if the base package is mingw- + * Tue May 24 2011 Kalev Lember - 69-1 - Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/ - Own the sbin/ directory From f88e1d894715daed51ba8dd4470e8267d82638fb Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 28 Jun 2011 11:35:38 +0300 Subject: [PATCH 59/71] Set Boost_COMPILER to -gcc46 in cmake toolchain file --- Toolchain-mingw32.cmake | 2 +- mingw32-filesystem.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 6c9c932..66ef563 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -22,4 +22,4 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) # override boost library suffix which defaults to -mgw -SET(Boost_COMPILER -gcc45) +SET(Boost_COMPILER -gcc46) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 3b711eb..0bcaabe 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -170,6 +170,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Jun 28 2011 Kalev Lember - 69-3 +- Set Boost_COMPILER to -gcc46 in cmake toolchain file + * Sun May 29 2011 Kalev Lember - 69-2 - Make sure the -debuginfo subpackages are mingw32- prefixed even if the base package is mingw- From 4269348602669d2faefa8208c073fa0aa9c7c409 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Fri, 1 Jul 2011 14:05:10 +0200 Subject: [PATCH 60/71] The %{_mingw32_qmake_qt4} macro pointed to an invalid mkspecs name. Fixed --- macros.mingw32 | 2 +- mingw32-filesystem.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 19ce4b8..95ac080 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -169,7 +169,7 @@ package or when debugging this package.\ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw32/Toolchain-mingw32.cmake %_mingw32_qmake_qt4 %{_mingw32_env} ; \ - %_qt4_qmake -spec win32-g++-fedora-cross + %_qt4_qmake -spec win32-g++-cross %_mingw32_description This is the cross-compiled version of this library / tool.\ You should only install this package if you want to cross-compile programs for \ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 0bcaabe..6285f1a 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -170,6 +170,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Fri Jul 1 2011 Erik van Pienbroek - 69-4 +- The %%{_mingw32_qmake_qt4} macro pointed to an invalid mkspecs name. Fixed + * Tue Jun 28 2011 Kalev Lember - 69-3 - Set Boost_COMPILER to -gcc46 in cmake toolchain file From 6d7bab80f9ce7a876ed271bdc000e5ba21263277 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 6 Jul 2011 21:32:35 +0300 Subject: [PATCH 61/71] Fixed dep gen with upper case dll names --- mingw32-filesystem.spec | 5 ++++- mingw32-find-requires.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 6285f1a..e2138f2 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -170,6 +170,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Wed Jul 06 2011 Kalev Lember - 69-5 +- Fixed dep gen with upper case dll names + * Fri Jul 1 2011 Erik van Pienbroek - 69-4 - The %%{_mingw32_qmake_qt4} macro pointed to an invalid mkspecs name. Fixed diff --git a/mingw32-find-requires.sh b/mingw32-find-requires.sh index ae1047e..da6bb2c 100755 --- a/mingw32-find-requires.sh +++ b/mingw32-find-requires.sh @@ -21,7 +21,7 @@ echo 'mingw32-runtime' dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$') for f in $dlls; do - $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' | + $OBJDUMP -p $f | grep 'DLL Name' | grep -Eio '[-._\+[:alnum:]]+\.dll' | tr [:upper:] [:lower:] | sed 's/\(.*\)/mingw32(\1)/' done | sort -u From 31e3471d42cbdbd55e78acf19028f1b58301a70c Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 6 Jul 2011 20:37:30 +0200 Subject: [PATCH 62/71] Use a more complete list of Win32 default dll's --- mingw32-filesystem.spec | 48 +++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index e2138f2..2fa71e2 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -38,22 +38,39 @@ Requires: pkgconfig # proprietary DLLs in our find-requires checking script - essentially # it comes out the same either way. # -Provides: mingw32(gdi32.dll) -Provides: mingw32(kernel32.dll) -Provides: mingw32(ole32.dll) -Provides: mingw32(mscoree.dll) -Provides: mingw32(msvcrt.dll) -Provides: mingw32(user32.dll) -Provides: mingw32(wldap32.dll) -Provides: mingw32(glut32.dll) -Provides: mingw32(secur32.dll) -Provides: mingw32(version.dll) +Provides: mingw32(advapi32.dll) Provides: mingw32(cfgmgr32.dll) -Provides: mingw32(setupapi.dll) -Provides: mingw32(rpcrt4.dll) -Provides: mingw32(ws2_32.dll) +Provides: mingw32(comctl32.dll) +Provides: mingw32(comdlg32.dll) +Provides: mingw32(crypt32.dll) +Provides: mingw32(ddraw.dll) +Provides: mingw32(dnsapi.dll) +Provides: mingw32(dsound.dll) +Provides: mingw32(gdi32.dll) Provides: mingw32(gdiplus.dll) +Provides: mingw32(glut32.dll) +Provides: mingw32(imm32.dll) +Provides: mingw32(kernel32.dll) +Provides: mingw32(mscoree.dll) +Provides: mingw32(msdmo.dll) +Provides: mingw32(msimg32.dll) +Provides: mingw32(msvcrt.dll) +Provides: mingw32(netapi32.dll) Provides: mingw32(odbc32.dll) +Provides: mingw32(ole32.dll) +Provides: mingw32(oleaut32.dll) +Provides: mingw32(opengl32.dll) +Provides: mingw32(rpcrt4.dll) +Provides: mingw32(secur32.dll) +Provides: mingw32(setupapi.dll) +Provides: mingw32(shell32.dll) +Provides: mingw32(shlwapi.dll) +Provides: mingw32(user32.dll) +Provides: mingw32(usp10.dll) +Provides: mingw32(version.dll) +Provides: mingw32(winmm.dll) +Provides: mingw32(wldap32.dll) +Provides: mingw32(ws2_32.dll) %description @@ -170,6 +187,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Wed Jul 6 2011 Erik van Pienbroek - 69-6 +- Use a more complete list of Win32 default dll's + * Wed Jul 06 2011 Kalev Lember - 69-5 - Fixed dep gen with upper case dll names From 444f8dd41c07e8227e3a8a1095914c4535fb9628 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 13 Jul 2011 14:29:09 +0200 Subject: [PATCH 63/71] Added glu32.dll and wsock32.dll to the list of Win32 default dll's --- mingw32-filesystem.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 2fa71e2..ec4e205 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -48,6 +48,7 @@ Provides: mingw32(dnsapi.dll) Provides: mingw32(dsound.dll) Provides: mingw32(gdi32.dll) Provides: mingw32(gdiplus.dll) +Provides: mingw32(glu32.dll) Provides: mingw32(glut32.dll) Provides: mingw32(imm32.dll) Provides: mingw32(kernel32.dll) @@ -71,6 +72,7 @@ Provides: mingw32(version.dll) Provides: mingw32(winmm.dll) Provides: mingw32(wldap32.dll) Provides: mingw32(ws2_32.dll) +Provides: mingw32(wsock32.dll) %description @@ -187,6 +189,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Wed Jul 13 2011 Erik van Pienbroek - 69-7 +- Added glu32.dll and wsock32.dll to the list of Win32 default dll's + * Wed Jul 6 2011 Erik van Pienbroek - 69-6 - Use a more complete list of Win32 default dll's From 926da27ec91423896945c232fe60caadfb01286b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 2 Aug 2011 10:34:01 +0300 Subject: [PATCH 64/71] Added avicap32.dll and psapi.dll to the list of Win32 default DLLs Thanks to Farkas Levente. http://lists.fedoraproject.org/pipermail/mingw/2011-August/004030.html --- mingw32-filesystem.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index ec4e205..1ed4448 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -39,6 +39,7 @@ Requires: pkgconfig # it comes out the same either way. # Provides: mingw32(advapi32.dll) +Provides: mingw32(avicap32.dll) Provides: mingw32(cfgmgr32.dll) Provides: mingw32(comctl32.dll) Provides: mingw32(comdlg32.dll) @@ -61,6 +62,7 @@ Provides: mingw32(odbc32.dll) Provides: mingw32(ole32.dll) Provides: mingw32(oleaut32.dll) Provides: mingw32(opengl32.dll) +Provides: mingw32(psapi.dll) Provides: mingw32(rpcrt4.dll) Provides: mingw32(secur32.dll) Provides: mingw32(setupapi.dll) @@ -189,6 +191,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Aug 02 2011 Kalev Lember - 69-8 +- Added avicap32.dll and psapi.dll to the list of Win32 default DLLs + (thanks to Farkas Levente) + * Wed Jul 13 2011 Erik van Pienbroek - 69-7 - Added glu32.dll and wsock32.dll to the list of Win32 default dll's From f1b50411fb4b002018d8a791e1ef025e9ccb308c Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 16 Nov 2011 01:35:40 +0100 Subject: [PATCH 65/71] Added various definitions to the CMake toolchain file (RHBZ #753906) --- Toolchain-mingw32.cmake | 6 ++++++ mingw32-filesystem.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 66ef563..8b94488 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -23,3 +23,9 @@ SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) # override boost library suffix which defaults to -mgw SET(Boost_COMPILER -gcc46) + +# These are needed for compiling lapack (RHBZ #753906) +SET(CMAKE_Fortran_COMPILER /usr/bin/i686-pc-mingw32-gfortran) +SET(CMAKE_AR /usr/bin/i686-pc-mingw32-ar) +SET(CMAKE_RANLIB /usr/bin/i686-pc-mingw32-ranlib) + diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 1ed4448..62dd72f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -191,6 +191,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Wed Nov 16 2011 Erik van Pienbroek - 69-9 +- Added various definitions to the CMake toolchain file (RHBZ #753906) + * Tue Aug 02 2011 Kalev Lember - 69-8 - Added avicap32.dll and psapi.dll to the list of Win32 default DLLs (thanks to Farkas Levente) From aa32785665fa4f3b2315176f07b1049342db640c Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 22 Nov 2011 23:52:28 +0100 Subject: [PATCH 66/71] Fixed a small regression introduced by the previous release Fixed a small regression introduced by the previous release which caused an FTBFS for mingw32-matahari as indicated on the fedora-mingw mailing list --- Toolchain-mingw32.cmake | 4 ++-- mingw32-filesystem.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 8b94488..9a575d0 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -26,6 +26,6 @@ SET(Boost_COMPILER -gcc46) # These are needed for compiling lapack (RHBZ #753906) SET(CMAKE_Fortran_COMPILER /usr/bin/i686-pc-mingw32-gfortran) -SET(CMAKE_AR /usr/bin/i686-pc-mingw32-ar) -SET(CMAKE_RANLIB /usr/bin/i686-pc-mingw32-ranlib) +SET(CMAKE_AR:FILEPATH /usr/bin/i686-pc-mingw32-ar) +SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-pc-mingw32-ranlib) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 62dd72f..3773eb9 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -191,6 +191,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Nov 22 2011 Erik van Pienbroek - 69-10 +- Fixed a small regression introduced by the previous release which caused an + FTBFS for mingw32-matahari as indicated on the fedora-mingw mailing list + * Wed Nov 16 2011 Erik van Pienbroek - 69-9 - Added various definitions to the CMake toolchain file (RHBZ #753906) From 2a5fde2ebb269d42c3b8b6bc63f885fb38aed0d4 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 11 Jan 2012 00:11:36 +0100 Subject: [PATCH 67/71] Set Boost_COMPILER to -gcc47 in cmake toolchain file --- Toolchain-mingw32.cmake | 2 +- mingw32-filesystem.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 9a575d0..25f70d0 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -22,7 +22,7 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) # override boost library suffix which defaults to -mgw -SET(Boost_COMPILER -gcc46) +SET(Boost_COMPILER -gcc47) # These are needed for compiling lapack (RHBZ #753906) SET(CMAKE_Fortran_COMPILER /usr/bin/i686-pc-mingw32-gfortran) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 3773eb9..940476e 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 10%{?dist} +Release: 11%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -191,6 +191,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Jan 10 2012 Erik van Pienbroek - 69-11 +- Set Boost_COMPILER to -gcc47 in cmake toolchain file + * Tue Nov 22 2011 Erik van Pienbroek - 69-10 - Fixed a small regression introduced by the previous release which caused an FTBFS for mingw32-matahari as indicated on the fedora-mingw mailing list From 92ccc6e10a514b063c29b4b642b19283a1235396 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 31 Jan 2012 20:38:26 +0100 Subject: [PATCH 68/71] Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now have a mingw32-pkg-config package --- macros.mingw32 | 3 +-- mingw32-filesystem.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 95ac080..54cf300 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -99,8 +99,7 @@ package or when debugging this package.\ done; \ unset x i -%_mingw32_pkg_config \ - PKG_CONFIG_LIBDIR="%{_mingw32_libdir}/pkgconfig:%{_mingw32_datadir}/pkgconfig" pkg-config +%_mingw32_pkg_config %{_mingw32_target}-pkg-config %_mingw32_configure %{_mingw32_env} ; \ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 940476e..ec2147f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 11%{?dist} +Release: 12%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -103,7 +103,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config i686-pc-mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do +for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -191,6 +191,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Jan 31 2012 Erik van Pienbroek - 69-12 +- Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now + have a mingw32-pkg-config package + * Tue Jan 10 2012 Erik van Pienbroek - 69-11 - Set Boost_COMPILER to -gcc47 in cmake toolchain file From adfc0e1651d0afb74ac56e66a67b3267e80c7739 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Tue, 31 Jan 2012 20:53:16 +0100 Subject: [PATCH 69/71] Fix filelist --- mingw32-filesystem.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index ec2147f..68034b2 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -180,7 +180,6 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %{_bindir}/mingw32-configure %{_bindir}/mingw32-make %{_bindir}/mingw32-pkg-config -%{_bindir}/i686-pc-mingw32-pkg-config %{_bindir}/mingw32-cmake %{_bindir}/mingw32-qmake-qt4 %{_libexecdir}/mingw32-scripts From 32d11948823c958e8443d16d8dc1ca95701dd380 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 31 Jan 2012 22:04:23 +0200 Subject: [PATCH 70/71] Remove the mingw32-pkg-config wrapper as well --- macros.mingw32 | 2 -- mingw32-filesystem.spec | 9 ++++++--- mingw32-scripts.sh | 6 +----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 54cf300..d80d38e 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -99,8 +99,6 @@ package or when debugging this package.\ done; \ unset x i -%_mingw32_pkg_config %{_mingw32_target}-pkg-config - %_mingw32_configure %{_mingw32_env} ; \ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ $__mingw32_topdir/configure --cache-file=%{_mingw32_cache} \\\ diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 68034b2..5c571e4 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 12%{?dist} +Release: 13%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -103,7 +103,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do +for i in mingw32-configure mingw32-make mingw32-cmake mingw32-qmake-qt4; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -179,7 +179,6 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %{_bindir}/mingw32-configure %{_bindir}/mingw32-make -%{_bindir}/mingw32-pkg-config %{_bindir}/mingw32-cmake %{_bindir}/mingw32-qmake-qt4 %{_libexecdir}/mingw32-scripts @@ -190,6 +189,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Jan 31 2012 Kalev Lember - 69-13 +- Remove the mingw32-pkg-config wrapper as well, now that we have separate + mingw32-pkg-config package + * Tue Jan 31 2012 Erik van Pienbroek - 69-12 - Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now have a mingw32-pkg-config package diff --git a/mingw32-scripts.sh b/mingw32-scripts.sh index f068e0a..8f36dd2 100755 --- a/mingw32-scripts.sh +++ b/mingw32-scripts.sh @@ -21,11 +21,7 @@ # This is a useful command-line script through which one can use the # macros from mingw32-macros.mingw32 cross-compilation. -if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then - NAME="_mingw32_pkg_config" -else - NAME="_`basename $0|tr -- - _`" -fi +NAME="_`basename $0|tr -- - _`" # NOTE: The use of 'eval' in combination with '$@' is a potential security risk # We should find a more safe replacement for this command From be0d63c8fbb59e7779ec1057867cfa9ce18fa54b Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Sun, 5 Feb 2012 20:32:21 +0100 Subject: [PATCH 71/71] Use a more complete list of Win32 default dlls Use a more complete list of Win32 default dlls based on the dlls exported by wine (thanks to Levente Farkas). RHBZ #787486 --- mingw32-filesystem.spec | 47 ++---- standard-dlls | 331 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 340 insertions(+), 38 deletions(-) create mode 100644 standard-dlls diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 5c571e4..17ee36f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 13%{?dist} +Release: 14%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -21,6 +21,9 @@ Source7: mingw32-rpmlint.config Source8: Toolchain-mingw32.cmake Source9: mingw32-find-debuginfo.sh Source10: mingw32.attr +# generated with: +# ls -1 /usr/lib64/wine/fakedlls | grep "\.dll$" >standard-dlls +Source11: standard-dlls Requires: pkgconfig @@ -38,43 +41,7 @@ Requires: pkgconfig # proprietary DLLs in our find-requires checking script - essentially # it comes out the same either way. # -Provides: mingw32(advapi32.dll) -Provides: mingw32(avicap32.dll) -Provides: mingw32(cfgmgr32.dll) -Provides: mingw32(comctl32.dll) -Provides: mingw32(comdlg32.dll) -Provides: mingw32(crypt32.dll) -Provides: mingw32(ddraw.dll) -Provides: mingw32(dnsapi.dll) -Provides: mingw32(dsound.dll) -Provides: mingw32(gdi32.dll) -Provides: mingw32(gdiplus.dll) -Provides: mingw32(glu32.dll) -Provides: mingw32(glut32.dll) -Provides: mingw32(imm32.dll) -Provides: mingw32(kernel32.dll) -Provides: mingw32(mscoree.dll) -Provides: mingw32(msdmo.dll) -Provides: mingw32(msimg32.dll) -Provides: mingw32(msvcrt.dll) -Provides: mingw32(netapi32.dll) -Provides: mingw32(odbc32.dll) -Provides: mingw32(ole32.dll) -Provides: mingw32(oleaut32.dll) -Provides: mingw32(opengl32.dll) -Provides: mingw32(psapi.dll) -Provides: mingw32(rpcrt4.dll) -Provides: mingw32(secur32.dll) -Provides: mingw32(setupapi.dll) -Provides: mingw32(shell32.dll) -Provides: mingw32(shlwapi.dll) -Provides: mingw32(user32.dll) -Provides: mingw32(usp10.dll) -Provides: mingw32(version.dll) -Provides: mingw32(winmm.dll) -Provides: mingw32(wldap32.dll) -Provides: mingw32(ws2_32.dll) -Provides: mingw32(wsock32.dll) +Provides: %(sed "s/\(.*\)/mingw32(\1) /g" %{SOURCE11} | tr "\n" " ") %description @@ -189,6 +156,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Sun Feb 5 2012 Erik van Pienbroek - 69-14 +- Use a more complete list of Win32 default dlls based on the + dlls exported by wine (thanks to Levente Farkas). RHBZ #787486 + * Tue Jan 31 2012 Kalev Lember - 69-13 - Remove the mingw32-pkg-config wrapper as well, now that we have separate mingw32-pkg-config package diff --git a/standard-dlls b/standard-dlls new file mode 100644 index 0000000..5b91468 --- /dev/null +++ b/standard-dlls @@ -0,0 +1,331 @@ +acledit.dll +aclui.dll +activeds.dll +actxprxy.dll +advapi32.dll +advpack.dll +amstream.dll +apphelp.dll +atl.dll +authz.dll +avicap32.dll +avifil32.dll +avrt.dll +bcrypt.dll +browseui.dll +cabinet.dll +capi2032.dll +cards.dll +cfgmgr32.dll +clusapi.dll +comcat.dll +comctl32.dll +comdlg32.dll +compstui.dll +credui.dll +crtdll.dll +crypt32.dll +cryptdlg.dll +cryptdll.dll +cryptnet.dll +cryptui.dll +ctapi32.dll +ctl3d32.dll +d3d10core.dll +d3d10.dll +d3d8.dll +d3d9.dll +d3dcompiler_33.dll +d3dcompiler_34.dll +d3dcompiler_35.dll +d3dcompiler_36.dll +d3dcompiler_37.dll +d3dcompiler_38.dll +d3dcompiler_39.dll +d3dcompiler_40.dll +d3dcompiler_41.dll +d3dcompiler_42.dll +d3dcompiler_43.dll +d3dim.dll +d3drm.dll +d3dx10_33.dll +d3dx10_34.dll +d3dx10_35.dll +d3dx10_36.dll +d3dx10_37.dll +d3dx10_38.dll +d3dx10_39.dll +d3dx10_40.dll +d3dx10_41.dll +d3dx10_42.dll +d3dx10_43.dll +d3dx9_24.dll +d3dx9_25.dll +d3dx9_26.dll +d3dx9_27.dll +d3dx9_28.dll +d3dx9_29.dll +d3dx9_30.dll +d3dx9_31.dll +d3dx9_32.dll +d3dx9_33.dll +d3dx9_34.dll +d3dx9_35.dll +d3dx9_36.dll +d3dx9_37.dll +d3dx9_38.dll +d3dx9_39.dll +d3dx9_40.dll +d3dx9_41.dll +d3dx9_42.dll +d3dx9_43.dll +d3dxof.dll +dbgeng.dll +dbghelp.dll +dciman32.dll +ddraw.dll +ddrawex.dll +devenum.dll +dhcpcsvc.dll +dinput8.dll +dinput.dll +dispex.dll +dmband.dll +dmcompos.dll +dmime.dll +dmloader.dll +dmscript.dll +dmstyle.dll +dmsynth.dll +dmusic32.dll +dmusic.dll +dnsapi.dll +dplay.dll +dplayx.dll +dpnaddr.dll +dpnet.dll +dpnhpast.dll +dpnlobby.dll +dpwsockx.dll +drmclien.dll +dsound.dll +dssenh.dll +dswave.dll +dwmapi.dll +dxdiagn.dll +dxgi.dll +explorerframe.dll +faultrep.dll +fltlib.dll +fusion.dll +fwpuclnt.dll +gameux.dll +gdi32.dll +gdiplus.dll +glu32.dll +gpkcsp.dll +hal.dll +hid.dll +hlink.dll +hnetcfg.dll +httpapi.dll +iccvid.dll +icmp.dll +ieframe.dll +imagehlp.dll +imm32.dll +inetcomm.dll +inetmib1.dll +infosoft.dll +initpki.dll +inkobj.dll +inseng.dll +iphlpapi.dll +itircl.dll +itss.dll +jscript.dll +kernel32.dll +ktmw32.dll +loadperf.dll +localspl.dll +localui.dll +lz32.dll +mapi32.dll +mapistub.dll +mciavi32.dll +mcicda.dll +mciqtz32.dll +mciseq.dll +mciwave.dll +midimap.dll +mlang.dll +mmcndmgr.dll +mmdevapi.dll +mprapi.dll +mpr.dll +msacm32.dll +mscat32.dll +mscms.dll +mscoree.dll +msctf.dll +msdaps.dll +msdmo.dll +msftedit.dll +mshtml.dll +msi.dll +msimg32.dll +msimsg.dll +msimtf.dll +msisip.dll +msnet32.dll +mspatcha.dll +msrle32.dll +mssign32.dll +mssip32.dll +mstask.dll +msvcirt.dll +msvcp100.dll +msvcp60.dll +msvcp70.dll +msvcp71.dll +msvcp80.dll +msvcp90.dll +msvcr100.dll +msvcr70.dll +msvcr71.dll +msvcr80.dll +msvcr90.dll +msvcrt20.dll +msvcrt40.dll +msvcrtd.dll +msvcrt.dll +msvfw32.dll +msvidc32.dll +mswsock.dll +msxml2.dll +msxml3.dll +msxml4.dll +msxml6.dll +msxml.dll +nddeapi.dll +netapi32.dll +newdev.dll +normaliz.dll +npmshtml.dll +ntdll.dll +ntdsapi.dll +ntprint.dll +objsel.dll +odbc32.dll +odbccp32.dll +ole32.dll +oleacc.dll +oleaut32.dll +olecli32.dll +oledb32.dll +oledlg.dll +olepro32.dll +olesvr32.dll +olethk32.dll +openal32.dll +opengl32.dll +pdh.dll +photometadatahandler.dll +pidgen.dll +powrprof.dll +printui.dll +propsys.dll +psapi.dll +pstorec.dll +qcap.dll +qedit.dll +qmgr.dll +qmgrprxy.dll +quartz.dll +query.dll +rasapi32.dll +rasdlg.dll +regapi.dll +resutils.dll +riched20.dll +riched32.dll +rpcrt4.dll +rsabase.dll +rsaenh.dll +rstrtmgr.dll +rtutils.dll +samlib.dll +scarddlg.dll +sccbase.dll +schannel.dll +scrrun.dll +secur32.dll +security.dll +sensapi.dll +serialui.dll +setupapi.dll +sfc.dll +sfc_os.dll +shdoclc.dll +shdocvw.dll +shell32.dll +shfolder.dll +shlwapi.dll +slbcsp.dll +slc.dll +snmpapi.dll +softpub.dll +spoolss.dll +sti.dll +svrapi.dll +sxs.dll +t2embed.dll +tapi32.dll +traffic.dll +twain_32.dll +unicows.dll +updspapi.dll +url.dll +urlmon.dll +user32.dll +userenv.dll +usp10.dll +uxtheme.dll +vbscript.dll +vcomp.dll +vdmdbg.dll +version.dll +wbemprox.dll +wer.dll +wiaservc.dll +windowscodecs.dll +wined3d.dll +winegstreamer.dll +winemapi.dll +wing32.dll +winhttp.dll +wininet.dll +winmm.dll +winnls32.dll +winscard.dll +winsta.dll +wintab32.dll +wintrust.dll +wlanapi.dll +wldap32.dll +wmi.dll +wmiutils.dll +wnaspi32.dll +ws2_32.dll +wsock32.dll +wtsapi32.dll +wuapi.dll +wuaueng.dll +xapofx1_1.dll +xinput1_1.dll +xinput1_2.dll +xinput1_3.dll +xinput9_1_0.dll +xmllite.dll +xolehlp.dll +xpsprint.dll