From c3cbc50a3a63cf1f4bb8075e7b25c157bd6d9092 Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Mar 24 2009 06:54:42 +0000 Subject: - add gcc 4.4 support --- diff --git a/0003-upgrade-known-version-of-gcc-to-4.5.patch b/0003-upgrade-known-version-of-gcc-to-4.5.patch new file mode 100644 index 0000000..cd66f4e --- /dev/null +++ b/0003-upgrade-known-version-of-gcc-to-4.5.patch @@ -0,0 +1,41 @@ +From d601364eb3ee592eaf7a414f748d794d46785f01 Mon Sep 17 00:00:00 2001 +From: Michael E Brown +Date: Tue, 24 Mar 2009 01:44:14 -0500 +Subject: [PATCH] upgrade known version of gcc to 4.5 + +--- + src/include/smbios/config/compiler/gcc.hpp | 3 +-- + src/include/smbios_c/config/compiler/gcc.h | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/include/smbios/config/compiler/gcc.hpp b/src/include/smbios/config/compiler/gcc.hpp +index d42d038..0891255 100644 +--- a/src/include/smbios/config/compiler/gcc.hpp ++++ b/src/include/smbios/config/compiler/gcc.hpp +@@ -113,8 +113,7 @@ + # error "Compiler not configured - please reconfigure" + #endif + // +-// last known and checked version is 3.4: +-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 3)) ++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)) + # if defined(LIBSMBIOS_ASSERT_CONFIG) + # error "Unknown compiler version - please run the configure tests and report the results" + # else +diff --git a/src/include/smbios_c/config/compiler/gcc.h b/src/include/smbios_c/config/compiler/gcc.h +index d542f65..8d83d4d 100644 +--- a/src/include/smbios_c/config/compiler/gcc.h ++++ b/src/include/smbios_c/config/compiler/gcc.h +@@ -23,8 +23,7 @@ + # error "GCC versions < 2.90 not supported" + #endif + // +-// last known and checked version is 3.4: +-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 4)) ++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)) + # if defined(LIBSMBIOS_C_ASSERT_CONFIG) + # error "Unknown compiler version - please run the configure tests and report the results" + # else +-- +1.6.0.6 + diff --git a/libsmbios.spec b/libsmbios.spec index c7772be..a805b19 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -88,11 +88,12 @@ Name: %{release_name} Version: %{release_version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ or OSL 2.1 Summary: Libsmbios C/C++ shared libraries Group: System Environment/Libraries Source: http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-%{version}/libsmbios-%{version}.tar.bz2 +Patch0: 0003-upgrade-known-version-of-gcc-to-4.5.patch URL: http://linux.dell.com/libsmbios/main Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: strace libxml2-devel gcc-c++ gettext doxygen %{valgrind_BR} %{cppunit_BR} %{fdupes_BR} %{pkgconfig_BR} %{python_devel_BR} @@ -180,6 +181,7 @@ programs against libsmbios. %prep %setup -q -n libsmbios-%{version} +%patch0 -p1 find . -type d -exec chmod -f 755 {} \; find doc src -type f -exec chmod -f 644 {} \; chmod 755 src/cppunit/*.sh @@ -363,6 +365,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Mar 24 2009 Michael E Brown - 2.2.16-1 +- add gcc 4.4 support + * Mon Mar 24 2009 Michael E Brown - 2.2.15-2 - update to lastest upstream. - fixes bug in bios update on systems with versions like x.y.z.