[Bug 514187] New: compiled mingw files include the sys-root path
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: compiled mingw files include the sys-root path
https://bugzilla.redhat.com/show_bug.cgi?id=514187
Summary: compiled mingw files include the sys-root path
Product: Fedora
Version: rawhide
Platform: All
OS/Version: Linux
Status: NEW
Severity: medium
Priority: low
Component: redhat-rpm-config
AssignedTo: jonathan(a)jonmasters.org
ReportedBy: pbonzini(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: lfarkas(a)lfarkas.org, t.sailer(a)alumni.ethz.ch,
berrange(a)redhat.com, pmatilai(a)redhat.com,
rjones(a)redhat.com, erik-fedora(a)vanpienbroek.nl,
jonathan(a)jonmasters.org,
fedora-mingw(a)lists.fedoraproject.org
Blocks: 513826
Classification: Fedora
Target Release: ---
Clone Of: 513826
+++ This bug was initially created as a clone of Bug #513826 +++
Description of problem:
The paths in the .pc files for mingw32 include the
/usr/i686-pc-mingw32/sys-root component. This would prevent using them within
the MSYS shell, for example.
It would be more correct to install them without the path and, in a
i686-pc-mingw32-pkg-config (see bug 513825), provide the PKG_CONFIG_SYSROOT_DIR
variable. The script would work like this then:
#! /bin/sh
PKG_CONFIG_SYSROOT_DIR=`i686-pc-mingw32-gcc --print-sysroot`
prefix=$PKG_CONFIG_SYSROOT_DIR/mingw
PKG_CONFIG_LIBDIR=$prefix/lib/pkgconfig:$prefix/share/pkgconfig
export PKG_CONFIG_LIBDIR # PKG_CONFIG_SYSROOT_DIR
exec pkg-config "$@"
--- Additional comment from pbonzini(a)redhat.com on 2009-07-26 15:15:36 EDT ---
To clarify: the paths work, but still they are not correct. Right now if I
want to install MSYS under Wine I have two choices:
1) I proceed as in bug 513819 so that the Fedora mingw root is visible under
MSYS. Then however I cannot use pkg-config under MSYS.
2) I copy everything from /usr/i686-pc-mingw32/sys-root/mingw under Wine's
c:/mingw, and then I lose all the updates that come through Fedora's package
manager. I also have to update the .pc files manually.
It's a lose-lose situation, and PKG_CONFIG_SYSROOT_DIR was meant exactly to
support this.
--- Additional comment from erik-fedora(a)vanpienbroek.nl on 2009-07-26 18:20:13
EDT ---
Why would you want to install MSYS under Wine? MSYS just provides some tools
which we already have native on Linux. The bash/sh from MSYS is also way slower
than native bash/sh
--- Additional comment from pbonzini(a)redhat.com on 2009-07-27 03:05:30 EDT ---
For testing. I want to make sure that there are no hidden bits in the
configure/make files that *only* work when crosscompiling (the typical example
is forgetting to quote a variable that could contain Windows \ paths).
Besides, the idea of a sysroot is to match *exactly* what would be on the
non-native system. I could take the Fedora sysroot and copy it to a real
Windows machine, and it should just work. Now instead if I do this and install
the Windows version of pkg-config, it will not work because the .pc files
contains pointers to the Fedora images.
This is not easy to fix (it is a "flag day" bug, you have to fix all packages
at once), so it may not have a high priority. But it is serious.
--- Additional comment from rjones(a)redhat.com on 2009-07-27 04:53:55 EDT ---
(In reply to comment #3)
> For testing. I want to make sure that there are no hidden bits in the
> configure/make files that *only* work when crosscompiling (the typical example
> is forgetting to quote a variable that could contain Windows \ paths).
>
> Besides, the idea of a sysroot is to match *exactly* what would be on the
> non-native system. I could take the Fedora sysroot and copy it to a real
> Windows machine, and it should just work. Now instead if I do this and install
> the Windows version of pkg-config, it will not work because the .pc files
> contains pointers to the Fedora images.
This isn't how we install on Windows at all. We use NSIS to
build installers.
And the aim of this project is to free developers from having to
use Windows at all, not to allow people to copy binaries onto a
Windows machine and continue development there.
The *.pc files contain the correct paths for cross-compiling
to a Windows host from a Fedora build system, which is precisely
the aim of this project.
--- Additional comment from pbonzini(a)redhat.com on 2009-07-28 04:36:53 EDT ---
Created an attachment (id=355373)
--> (https://bugzilla.redhat.com/attachment.cgi?id=355373)
redhat-rpm-config part of the patch
The remaining part is to change the packages to do a change similar to what the
patch does to %{_mingw32_makeinstall}.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
14 years, 7 months
[Bug 513819] mingw directory not visible as a wine DOS path
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
https://bugzilla.redhat.com/show_bug.cgi?id=513819
Richard W.M. Jones <rjones(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |CLOSED
Resolution| |NOTABUG
--- Comment #13 from Richard W.M. Jones <rjones(a)redhat.com> 2009-09-09 10:10:15 EDT ---
I can't see that there's a real bug here. If you
want to suggest ways to improve the MinGW packaging,
then please discuss it on the list. You might also
want to try out any ideas by reproducing our
smock build environment, which will let you build
all ~200 MinGW packages.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
14 years, 7 months
rpms/mingw32-iconv/devel mingw32-iconv.spec,1.4,1.5
by Erik van Pienbroek
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-iconv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27792
Modified Files:
mingw32-iconv.spec
Log Message:
* Mon Sep 7 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.12-11
- Fixed %defattr line
- Added -static subpackage
- Use %global instead of %define
- Automatically generate debuginfo subpackage
Index: mingw32-iconv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-iconv/devel/mingw32-iconv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-iconv.spec 25 Jul 2009 12:19:48 -0000 1.4
+++ mingw32-iconv.spec 7 Sep 2009 18:07:09 -0000 1.5
@@ -1,12 +1,13 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-iconv
Version: 1.12
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: GNU libraries and utilities for character set conversion
License: GPLv2+ and LGPLv2+
@@ -16,7 +17,7 @@ Source0: http://ftp.gnu.org/pub/gnu/li
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 49
+BuildRequires: mingw32-filesystem >= 52
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
@@ -31,12 +32,24 @@ BuildRequires: mingw32-binutils
MinGW Windows Iconv library
+%package static
+Summary: Static version of the MinGW Windows Iconv library
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+
+%description static
+Static version of the MinGW Windows Iconv library.
+
+
+%{_mingw32_debug_package}
+
+
%prep
%setup -q -n libiconv-%{version}
%build
-%{_mingw32_configure}
+%{_mingw32_configure} --enable-static --enable-shared
make
@@ -60,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc COPYING COPYING.LIB
%{_mingw32_bindir}/iconv
%{_mingw32_bindir}/libcharset-1.dll
@@ -69,14 +82,24 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_includedir}/libcharset.h
%{_mingw32_includedir}/localcharset.h
%{_mingw32_libdir}/charset.alias
-%{_mingw32_libdir}/libcharset.a
%{_mingw32_libdir}/libcharset.dll.a
%{_mingw32_libdir}/libcharset.la
%{_mingw32_libdir}/libiconv.dll.a
%{_mingw32_libdir}/libiconv.la
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcharset.a
+%{_mingw32_libdir}/libiconv.a
+
%changelog
+* Mon Sep 7 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 1.12-11
+- Fixed %%defattr line
+- Added -static subpackage
+- Use %%global instead of %%define
+- Automatically generate debuginfo subpackage
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.12-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
14 years, 7 months
wxWidgets(2.8.9) RPM spec for F11
by Michael Ansel
While working on a project for class, I needed to cross-compile a
program built with wxWidgets onto Windows. Since all I could find was
an RPM built for F10, I went ahead and updated the spec to build on
F11, and would really love to include it in the Fedora repos. However,
as I am a double major (EE/CompSci) taking 4 lab classes, I don't
think I'm going to have much more time to work on this. :-/ As such, I
wanted to post this out for anyone with a little available time to
take a shot at fixing it up to the Fedora Standard and then pushing it
through the proper review process. Two notes on the spec: 1) It builds
a standard and a static package, but I have no idea if they are
properly separated; 2) I think all the BuildPrereqs are correct, but
someone more familiar with wxWidgets should probably double check
them. Thanks to everyone for the awesome work on mingw32: the package
build and cross-compilation processes were a breeze! :-D
Michael Ansel
$ cat mingw-wxWidgets.spec
# $Id: mingw32-wxWidgets.spec,v 1.6 2008/12/18 10:13:33 bitwalk Exp $
# Workaround for the problem of /usr/bin/strip not handling PE binaries.
%define __strip /usr/bin/i686-pc-mingw32-strip
# Don't build debuginfo packages
%define debug_package %{nil}
%define pkgVer 2.8.9
Summary: wxWidgets
Name: mingw32-wxWidgets
Version: %{pkgVer}
Release: 2%{?dist}
License: wxWidgets Library Licence
Packager: Keiichi Takahashi <bitwalk(a)users.soureforge.net>
Vendor: bitWalk Co., Ltd.
Group: Development/Libraries
URL: http://wxwidgets.org
Source: http://prdownloads.sourceforge.net/wxwindows/wxWidgets-%{pkgVer}.tar.gz
Buildroot: %{_tmppath}/%{name}-root
BuildPrereq: mingw32-runtime, mingw32-w32api, mingw32-binutils,
mingw32-expat, mingw32-gcc, mingw32-gcc-c++, mingw32-libjpeg,
mingw32-libpng, mingw32-libtiff, mingw32-zlib
Requires: mingw32-runtime, mingw32-expat, mingw32-libjpeg,
mingw32-libpng, mingw32-libtiff, mingw32-zlib
%description
wxWidgets is the C++ cross-platform GUI library, offering classes for all
common GUI controls as well as a comprehensive set of helper classes for most
common application tasks, ranging from networking to HTML display and image
manipulation.
%package static
Summary: Static libraries for mingw32-wxWidgets development.
Group: Development/Libraries
Requires: mingw32-wxWidgets = %{version}-%{release}
%description static
The mingw32-wxWidgets-static package contains static library for
mingw32-wxWidgets development.
%prep
%setup -q -n wxWidgets-%{pkgVer}
#==========================================
%build
#========= Shared Libraries ==========
mkdir obj-shared
cd obj-shared
%_mingw32_configure --enable-shared \
--with-msw \
--with-sdl \
--enable-unicode \
--enable-optimise \
--with-regex=builtin \
--disable-rpath \
--without-subdirs
if [ "$SMP" != "" ]; then
%_mingw32_make -j$SMP
else
%_mingw32_make
fi
cd ..
#========= Static Libraries ==========
mkdir obj-static
cd obj-static
%_mingw32_configure --disable-shared \
--with-msw \
--with-sdl \
--enable-unicode \
--enable-optimise \
--with-regex=builtin \
--disable-rpath \
--without-subdirs
if [ "$SMP" != "" ]; then
%_mingw32_make -j$SMP
else
%_mingw32_make
fi
cd ..
#==========================================
%install
rm -rf $RPM_BUILD_ROOT
%_mingw32_makeinstall -C obj-shared
%_mingw32_makeinstall -C obj-static
if ls $RPM_BUILD_ROOT%{_mingw32_libdir}/*.dll ; then
mv $RPM_BUILD_ROOT%{_mingw32_libdir}/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
else
echo "No shared libraries found."
fi
# we need to modify the absolute wx-config link to be relative or rpm complains
# (and our package wouldn't be relocatable)
wx_config_filename=$(basename
$RPM_BUILD_ROOT%{_mingw32_libdir}/wx/config/%{_mingw32_target}-*-release-[0-9]*)
ln -sf ../lib/wx/config/$wx_config_filename
$RPM_BUILD_ROOT%{_mingw32_bindir}/wx-config
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_mingw32_prefix}
#TODO Need to select all files EXCEPT for static libraries
%files static
%defattr(-,root,root,-)
%{_mingw32_libdir}/*.a
%{_mingw32_libdir}/wx/config/%{_mingw32_target}-*-static-*
%changelog
* Wed Aug 26 2009 Michael Ansel <michael.ansel(a)gmail.com> 2.8.9-2
- update for Fedora 11 (mingw -> mingw32)
- use mingw32 macros
- add static subpackage
* Thu Dec 18 2008 Keiichi Takahashi <bitwalk(a)users.soureforge.net> 2.8.9-1
- update to 2.8.9
* Tue Aug 12 2008 Keiichi Takahashi <bitwalk(a)users.soureforge.net> 2.8.8-1
- update to 2.8.8
* Sat Mar 15 2008 Keiichi Takahashi <bitwalk(a)users.soureforge.net> 2.8.7-2
- rebuilt with current libraries.
- add BuildPrereq and Requires more explicitly.
* Thu Feb 28 2008 Keiichi Takahashi <bitwalk(a)users.soureforge.net> 2.8.7-1
- initial release
14 years, 7 months
rpms/mingw32-glib2/devel .cvsignore, 1.9, 1.10 mingw32-glib2.spec, 1.14, 1.15 sources, 1.9, 1.10
by Erik van Pienbroek
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-glib2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10745
Modified Files:
.cvsignore mingw32-glib2.spec sources
Log Message:
Update to 2.21.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 27 Aug 2009 20:43:19 -0000 1.9
+++ .cvsignore 5 Sep 2009 09:05:48 -0000 1.10
@@ -1 +1 @@
-glib-2.21.5.tar.bz2
+glib-2.21.6.tar.bz2
Index: mingw32-glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/mingw32-glib2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mingw32-glib2.spec 27 Aug 2009 20:43:19 -0000 1.14
+++ mingw32-glib2.spec 5 Sep 2009 09:05:48 -0000 1.15
@@ -6,7 +6,7 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-glib2
-Version: 2.21.5
+Version: 2.21.6
Release: 1%{?dist}
Summary: MinGW Windows GLib2 library
@@ -176,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 5 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.21.6-1
+- Update to 2.21.6
+
* Mon Aug 24 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 2.21.5-1
- Update to 2.21.5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-glib2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 27 Aug 2009 20:43:20 -0000 1.9
+++ sources 5 Sep 2009 09:05:48 -0000 1.10
@@ -1 +1 @@
-5f3f19c4a8088c51e21cad5b8ea166e5 glib-2.21.5.tar.bz2
+3b0452fbd877db53dafabdc074600cb8 glib-2.21.6.tar.bz2
14 years, 7 months
rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.28, 1.29 mingw32-scripts.sh, 1.3, 1.4
by Erik van Pienbroek
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25784
Modified Files:
mingw32-filesystem.spec mingw32-scripts.sh
Log Message:
* Tue Sep 1 2009 Erik van Pienbroek <epienbro(a)fedoraproject.org> - 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
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- mingw32-filesystem.spec 29 Aug 2009 14:35:44 -0000 1.28
+++ mingw32-filesystem.spec 1 Sep 2009 21:42:50 -0000 1.29
@@ -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 <epienbro(a)fedoraproject.org> - 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 <epienbro(a)fedoraproject.org> - 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)
Index: mingw32-scripts.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-scripts.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-scripts.sh 29 Aug 2009 14:40:08 -0000 1.3
+++ mingw32-scripts.sh 1 Sep 2009 21:42:50 -0000 1.4
@@ -26,4 +26,8 @@ if [ "`basename $0`" = "i686-pc-mingw32-
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}"`" '"$@"'
14 years, 8 months
mingw32-gcc update
by Kalev Lember
Hello,
I would like to update mingw32-gcc in rawhide to match the version of
Fedora's native gcc package. I also think we should track native gcc
version more closely; last update was in March 23, which is exactly 6
months ago. If we do the big update now, we should have plenty of time
to sort out regressions before the Beta freeze.
The license of native gcc package has changed from:
GPLv3+ and GPLv2+ with exceptions
to:
GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
I have applied the license change to my copy mingw32-gcc spec file as
well, although I should point out that rpmlint thinks the license is
not valid:
W: invalid-license GPLv3+, GPLv3+ with exceptions
I also adopted a trick from native package to change what gcc --version
reports. Without that it would say 4.4.2 prerelease, but now it says:
$ i686-pc-mingw32-gcc --version
i686-pc-mingw32-gcc (GCC) 4.4.1 20090818 (Fedora MinGW 4.4.1-1.fc12)
Koji build: http://koji.fedoraproject.org/koji/taskinfo?taskID=1626943
Diff to the mingw32-gcc.spec file (patches are just copied over from the
native gcc package):
Index: mingw32-gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-gcc/devel/mingw32-gcc.spec,v
retrieving revision 1.6
diff -u -r1.6 mingw32-gcc.spec
--- mingw32-gcc.spec 25 Jul 2009 12:17:32 -0000 1.6
+++ mingw32-gcc.spec 23 Aug 2009 11:14:20 -0000
@@ -1,14 +1,14 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
-%define DATE 20090319
-%define SVNREV 144967
+%global DATE 20090818
+%global SVNREV 150873
Name: mingw32-gcc
-Version: 4.4.0
-Release: 0.8%{?dist}
+Version: 4.4.1
+Release: 1%{?dist}
Summary: MinGW Windows cross-compiler (GCC) for C
-License: GPLv3+ and GPLv2+ with exceptions
+License: GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
Group: Development/Languages
# We use the same source as Fedora's native gcc.
@@ -25,8 +25,6 @@
Patch3: gcc44-ia64-libunwind.patch
Patch4: gcc44-java-nomulti.patch
Patch5: gcc44-ppc32-retaddr.patch
-Patch7: gcc44-pr27898.patch
-Patch8: gcc44-pr32139.patch
Patch9: gcc44-pr33763.patch
Patch10: gcc44-rh330771.patch
Patch11: gcc44-rh341221.patch
@@ -37,13 +35,15 @@
Patch20: gcc44-libtool-no-rpath.patch
Patch21: gcc44-cloog-dl.patch
Patch22: gcc44-raw-string.patch
-Patch24: gcc44-atom.patch
-Patch25: gcc44-pr39226.patch
-Patch26: gcc44-power7.patch
-Patch27: gcc44-power7-2.patch
+Patch24: gcc44-unwind-debug-hook.patch
+Patch25: gcc44-power7.patch
+Patch26: gcc44-power7-2.patch
+Patch27: gcc44-power7-3.patch
Patch28: gcc44-pr38757.patch
-Patch29: gcc44-pr37959.patch
-Patch30: gcc44-memmove-opt.patch
+#Patch29: gcc44-libstdc++-docs.patch
+Patch30: gcc44-rh503816-1.patch
+Patch31: gcc44-rh503816-2.patch
+Patch32: gcc44-unique-object.patch
BuildRoot:
%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -128,8 +128,6 @@
%patch3 -p0 -b .ia64-libunwind~
%patch4 -p0 -b .java-nomulti~
%patch5 -p0 -b .ppc32-retaddr~
-%patch7 -p0 -b .pr27898~
-%patch8 -p0 -b .pr32139~
%patch9 -p0 -b .pr33763~
%patch10 -p0 -b .rh330771~
%patch11 -p0 -b .rh341221~
@@ -140,13 +138,17 @@
%patch20 -p0 -b .libtool-no-rpath~
%patch21 -p0 -b .cloog-dl~
%patch22 -p0 -b .raw-string~
-%patch24 -p0 -b .atom~
-%patch25 -p0 -b .pr39226~
-%patch26 -p0 -b .power7~
-%patch27 -p0 -b .power7-2~
+%patch24 -p0 -b .unwind-debug-hook~
+%patch25 -p0 -b .power7~
+%patch26 -p0 -b .power7-2~
+%patch27 -p0 -b .power7-3~
%patch28 -p0 -b .pr38757~
-%patch29 -p0 -b .pr37959~
-%patch30 -p0 -b .memmove-opt~
+%patch30 -p0 -b .rh503816-1~
+%patch31 -p0 -b .rh503816-2~
+%patch32 -p0 -b .unique-object~
+
+sed -i -e 's/4\.4\.2/%{version}/' gcc/BASE-VER
+echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
%build
@@ -216,7 +218,7 @@
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/i686-pc-mingw32-gcc
%{_bindir}/i686-pc-mingw32-gcc-%{version}
%{_bindir}/i686-pc-mingw32-gccbug
@@ -253,7 +255,7 @@
%files -n mingw32-cpp
-%defattr(-,root,root)
+%defattr(-,root,root,-)
/lib/i686-pc-mingw32-cpp
%{_bindir}/i686-pc-mingw32-cpp
%{_mandir}/man1/i686-pc-mingw32-cpp.1*
@@ -263,7 +265,7 @@
%files c++
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/i686-pc-mingw32-g++
%{_bindir}/i686-pc-mingw32-c++
%{_mandir}/man1/i686-pc-mingw32-g++.1*
@@ -275,19 +277,19 @@
%files objc
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libdir}/gcc/i686-pc-mingw32/%{version}/include/objc/
%{_libdir}/gcc/i686-pc-mingw32/%{version}/libobjc.a
%{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1obj
%files objc++
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_libexecdir}/gcc/i686-pc-mingw32/%{version}/cc1objplus
%files gfortran
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/i686-pc-mingw32-gfortran
%{_mandir}/man1/i686-pc-mingw32-gfortran.1*
%{_libdir}/gcc/i686-pc-mingw32/%{version}/libgfortran.a
@@ -296,6 +298,12 @@
%changelog
+* Sun Aug 23 2009 Kalev Lember <kalev(a)smartlink.ee> - 4.4.1-1
+- Update to gcc 4.4.1 20090818 svn 150873.
+- Patches taken from native Fedora gcc-4.4.1-6.
+- Replaced %%define with %%global and updated %%defattr.
+- Changed license to match native Fedora gcc package.
+
* Sat Jul 25 2009 Fedora Release Engineering
<rel-eng(a)lists.fedoraproject.org> - 4.4.0-0.8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
14 years, 8 months