[packages/libsmbios] - fix building with autoconf not supporting lzma anymore - update gcc patch for 4.9.x - add x32 buil

baggins baggins at pld-linux.org
Sat Apr 4 00:53:04 CEST 2015


commit 0ce7a658df7a091142d97f104a735fa3bdc705a2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 4 00:52:16 2015 +0200

    - fix building with autoconf not supporting lzma anymore
    - update gcc patch for 4.9.x
    - add x32 build
    - rel 2

 ac.patch                                     | 11 +++++++++++
 libsmbios-gcc46.patch => libsmbios-gcc.patch |  2 +-
 libsmbios.spec                               |  8 +++++---
 3 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/libsmbios.spec b/libsmbios.spec
index 9f51be8..462ccd8 100644
--- a/libsmbios.spec
+++ b/libsmbios.spec
@@ -2,14 +2,15 @@ Summary:	Open BIOS parsing library
 Summary(pl.UTF-8):	Biblioteka analizująca Open BIOS
 Name:		libsmbios
 Version:	2.2.28
-Release:	1
+Release:	2
 License:	OSL v2.1 or GPL v2+
 Group:		Libraries
 Source0:	http://linux.dell.com/libsmbios/download/libsmbios/%{name}-%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	4e167e8d108e287defc3c461f50ef159
 Patch0:		%{name}-sh.patch
 Patch1:		%{name}-link.patch
-Patch2:		%{name}-gcc46.patch
+Patch2:		%{name}-gcc.patch
+Patch3:		ac.patch
 URL:		http://linux.dell.com/libsmbios/main/index.html
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1.6
@@ -22,7 +23,7 @@ BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
 BuildRequires:	python >= 2.3
 BuildRequires:	rpmbuild(macros) >= 1.219
-ExclusiveArch:	%{ix86} %{x8664}
+ExclusiveArch:	%{ix86} %{x8664} x32
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -94,6 +95,7 @@ libsmbios.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
diff --git a/ac.patch b/ac.patch
new file mode 100644
index 0000000..32d81c9
--- /dev/null
+++ b/ac.patch
@@ -0,0 +1,11 @@
+--- libsmbios-2.2.28/configure.ac~	2015-04-04 00:47:29.000000000 +0200
++++ libsmbios-2.2.28/configure.ac	2015-04-04 00:48:13.260973050 +0200
+@@ -45,7 +45,7 @@
+ AC_CONFIG_AUX_DIR([pkg])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_HOST
+-AM_INIT_AUTOMAKE([subdir-objects tar-ustar dist-bzip2 dist-lzma no-define -Wno-portability ])
++AM_INIT_AUTOMAKE([subdir-objects tar-ustar dist-bzip2 no-define -Wno-portability ])
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.4])
+ AC_GNU_SOURCE
diff --git a/libsmbios-gcc46.patch b/libsmbios-gcc.patch
similarity index 88%
rename from libsmbios-gcc46.patch
rename to libsmbios-gcc.patch
index 6bea9c1..7e7c519 100644
--- a/libsmbios-gcc46.patch
+++ b/libsmbios-gcc.patch
@@ -5,7 +5,7 @@
  #endif
  //
 -#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 6))
++#if (__GNUC__ > 4) || ((__GNUC__ == 9) && (__GNUC_MINOR__ > 6))
  #  if defined(LIBSMBIOS_ASSERT_CONFIG)
  #     error "Unknown compiler version - please run the configure tests and report the results"
  #  else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsmbios.git/commitdiff/0ce7a658df7a091142d97f104a735fa3bdc705a2



More information about the pld-cvs-commit mailing list