This commit is contained in:
parent
b3f66ab629
commit
e15d82a901
51
libsmbios-2.0.2-gcc44.patch
Normal file
51
libsmbios-2.0.2-gcc44.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
Index: libraries/cmos/CmosRW.cpp
|
||||||
|
===================================================================
|
||||||
|
--- libraries/cmos/CmosRW.cpp.orig 2008-02-13 20:12:43.000000000 +0100
|
||||||
|
+++ libraries/cmos/CmosRW.cpp 2009-03-02 17:10:07.000000000 +0100
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
// compat header should always be first header if including system headers
|
||||||
|
#define LIBSMBIOS_SOURCE
|
||||||
|
#include "smbios/compat.h"
|
||||||
|
+#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include "CmosRWImpl.h"
|
||||||
|
Index: libraries/memory/Memory_Linux.cpp
|
||||||
|
===================================================================
|
||||||
|
--- libraries/memory/Memory_Linux.cpp.orig 2007-10-20 00:15:12.000000000 +0200
|
||||||
|
+++ libraries/memory/Memory_Linux.cpp 2009-03-02 17:09:33.000000000 +0100
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
// compat header should always be first header if including system headers
|
||||||
|
#define LIBSMBIOS_SOURCE
|
||||||
|
#include "smbios/compat.h"
|
||||||
|
-
|
||||||
|
+#include <stdio.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <sys/mman.h> /* mmap */
|
||||||
|
#include <unistd.h> /* getpagesize */
|
||||||
|
Index: libraries/smbios/SmbiosStrategy_Linux.cpp
|
||||||
|
===================================================================
|
||||||
|
--- libraries/smbios/SmbiosStrategy_Linux.cpp.orig 2007-10-20 00:15:12.000000000 +0200
|
||||||
|
+++ libraries/smbios/SmbiosStrategy_Linux.cpp 2009-03-02 17:12:32.000000000 +0100
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
// compat header should always be first header if including system headers
|
||||||
|
#define LIBSMBIOS_SOURCE
|
||||||
|
#include "smbios/compat.h"
|
||||||
|
-
|
||||||
|
+#include <stdio.h>
|
||||||
|
#include <sstream>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
Index: libraries/smi/SmiImpl.h
|
||||||
|
===================================================================
|
||||||
|
--- libraries/smi/SmiImpl.h.orig 2007-11-27 18:50:54.000000000 +0100
|
||||||
|
+++ libraries/smi/SmiImpl.h 2009-03-02 17:13:45.000000000 +0100
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
|
||||||
|
#ifndef SMIIMPL_H
|
||||||
|
#define SMIIMPL_H
|
||||||
|
-
|
||||||
|
+#include <stdio.h>
|
||||||
|
#include "smbios/ISmi.h"
|
||||||
|
#include "SmiLowLevel.h"
|
||||||
|
#include "ExceptionImpl.h"
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 2 17:15:14 CET 2009 - crrodriguez@suse.de
|
||||||
|
|
||||||
|
- fix build with GCC 4.4
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Nov 7 11:44:16 CET 2008 - dkukawka@suse.de
|
Fri Nov 7 11:44:16 CET 2008 - dkukawka@suse.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libsmbios (Version MACRO)
|
# spec file for package libsmbios (Version MACRO)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -37,10 +37,11 @@ Url: http://linux.dell.com/libsmbios/main/index.html
|
|||||||
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
|
%define release_version %{major}.%{minor}.%{sub}%{extralevel}
|
||||||
%define LIBNAME libsmbios2
|
%define LIBNAME libsmbios2
|
||||||
Version: %{major}.%{minor}.%{sub}
|
Version: %{major}.%{minor}.%{sub}
|
||||||
Release: 10
|
Release: 12
|
||||||
License: BSD 3-Clause; GPL v2 or later; Other uncritical OpenSource License
|
License: BSD 3-Clause; GPL v2 or later; Other uncritical OpenSource License
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Patch0: libsmbios-fix-compiler_warning_cgcc.diff
|
Patch0: libsmbios-fix-compiler_warning_cgcc.diff
|
||||||
|
Patch1: libsmbios-2.0.2-gcc44.patch
|
||||||
Summary: Open BIOS parsing libs
|
Summary: Open BIOS parsing libs
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -165,13 +166,14 @@ Authors:
|
|||||||
Michael Brown
|
Michael Brown
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup -q
|
||||||
%patch0
|
%patch0
|
||||||
|
%patch1
|
||||||
find . -type d -exec chmod -f 755 {} \;
|
find . -type d -exec chmod -f 755 {} \;
|
||||||
find doc include libraries bin-supported bin-unsupported build cppunit -type f -exec chmod -f 644 {} \;
|
find doc include libraries bin-supported bin-unsupported build cppunit -type f -exec chmod -f 644 {} \;
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure --disable-static --with-pic
|
||||||
make %{?_smp_mflags} EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel}
|
make %{?_smp_mflags} EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel}
|
||||||
%if %{build_docs}
|
%if %{build_docs}
|
||||||
make -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} doxygen
|
make -e RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_SUBLEVEL=%{sub} RELEASE_EXTRALEVEL=%{extralevel} doxygen
|
||||||
@ -181,15 +183,14 @@ make %{?_smp_mflags} EXTRA_CXXFLAGS="%{optflags}" EXTRA_CFLAGS="%{optflags}" -e
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
|
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
mkdir -p %{buildroot}/usr/include
|
mkdir -p %{buildroot}/usr/include
|
||||||
cp -a include/smbios %{buildroot}/usr/include/
|
cp -a include/smbios %{buildroot}/usr/include/
|
||||||
rm -f %{buildroot}/%{_libdir}/lib*.la
|
rm -vf %{buildroot}/%{_libdir}/lib*.la
|
||||||
rm -f %{buildroot}/%{_libdir}/lib*.a
|
rm -fv %{buildroot}/%{_libdir}/lib*.a
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
%if 0%{?suse_version} < 1100
|
%if 0%{?suse_version} < 1100
|
||||||
|
|
||||||
%post libs -p /sbin/ldconfig
|
%post libs -p /sbin/ldconfig
|
||||||
@ -263,6 +264,8 @@ rm -f %{buildroot}/%{_libdir}/lib*.a
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 02 2009 crrodriguez@suse.de
|
||||||
|
- fix build with GCC 4.4
|
||||||
* Fri Nov 07 2008 dkukawka@suse.de
|
* Fri Nov 07 2008 dkukawka@suse.de
|
||||||
- fixed spec:
|
- fixed spec:
|
||||||
- added Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) for
|
- added Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) for
|
||||||
|
Loading…
Reference in New Issue
Block a user