Fix build for new gcc-4.4

This commit is contained in:
Joel Andres Granados Moreno 2009-02-26 20:42:44 +00:00
parent fbee96fb54
commit 0edbc19d8a
2 changed files with 41 additions and 2 deletions

View File

@ -0,0 +1,34 @@
diff -ur parted-1.8.8/lib/regex_internal.h parted-1.8.8-newgcc4.4/lib/regex_internal.h
--- parted-1.8.8/lib/regex_internal.h 2007-06-06 20:35:17.000000000 +0200
+++ parted-1.8.8-newgcc4.4/lib/regex_internal.h 2009-02-26 21:35:11.000000000 +0100
@@ -182,10 +182,6 @@
# if BITSET_WORD_BITS <= SBC_MAX
# error "Invalid SBC_MAX"
# endif
-#elif BITSET_WORD_MAX == (0xffffffff + 2) * 0xffffffff
-/* Work around a bug in 64-bit PGC (before version 6.1-2), where the
- preprocessor mishandles large unsigned values as if they were signed. */
-# define BITSET_WORD_BITS 64
#else
# error "Add case for new bitset_word_t size"
#endif
diff -ur parted-1.8.8/libparted/fs/fat/fat.c parted-1.8.8-newgcc4.4/libparted/fs/fat/fat.c
--- parted-1.8.8/libparted/fs/fat/fat.c 2007-07-23 19:58:31.000000000 +0200
+++ parted-1.8.8-newgcc4.4/libparted/fs/fat/fat.c 2009-02-26 21:37:11.000000000 +0100
@@ -267,10 +267,13 @@
static uint32_t
_gen_new_serial_number ()
{
- uuid_t uuid;
+ union {
+ uuid_t uuid;
+ uint32_t i;
+ } uu32;
- uuid_generate (uuid);
- return * (uint32_t*) &uuid [0];
+ uuid_generate (uu32.uuid);
+ return uu32.i;
}
PedFileSystem*

View File

@ -4,7 +4,7 @@
Summary: The GNU disk partition manipulation program
Name: parted
Version: 1.8.8
Release: 13%{?dist}
Release: 14%{?dist}
License: GPLv3+
Group: Applications/System
URL: http://www.gnu.org/software/parted
@ -22,6 +22,7 @@ Patch8: %{name}-1.8.8-appletv.patch
Patch9: %{name}-1.8.8-s390-compile.patch
Patch10: %{name}-1.8.8-sparc-enableraid.patch
Patch11: %{name}-1.8.8-avoid-none-stat.patch
Patch12: %{name}-1.8.8-newgcc4.4.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel
@ -70,6 +71,7 @@ Parted library, you need to install this package.
%patch9 -p1 -b .s390-compile
%patch10 -p1 -b .sparc-raid
%patch11 -p1 -b .avoid-none-stat
%patch12 -p1 -b .newgcc4.4
%build
%configure --enable-device-mapper --enable-selinux --disable-static
@ -127,10 +129,13 @@ fi
%{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
%changelog
* Thu Feb 26 2009 Joel Granados <jgranado@redhat.com> - 1.8.8-13
- Fix parted build for gcc-4.4
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.8-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Jan 22 2009 Joel Granados <jgranado@redhat.com> - 1.8.8.-12
* Thu Jan 22 2009 Joel Granados <jgranado@redhat.com> - 1.8.8-12
- Avoid the calling of stat for strings that don't begin with the "/" char (#353191).
* Sat Dec 13 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.8.8-11