Don't force the compiler version check on consumers of the library.
This check just stops things from building when the compiler gets upgraded, and it clearly hasn't been maintained in some time. The .so almost certainly still works fine, and if the headers don't, the consuming build will fail anyway. Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones
parent
d8690ef4f2
commit
651fed9793
165
0001-Don-t-force-the-compiler-version-check-on-consumers-.patch
Normal file
165
0001-Don-t-force-the-compiler-version-check-on-consumers-.patch
Normal file
@ -0,0 +1,165 @@
|
||||
From 74913b28e3a436a6c519f66332a0b140bf72aa67 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Thu, 25 Feb 2016 15:22:57 -0500
|
||||
Subject: [PATCH] Don't force the compiler version check on consumers of the
|
||||
library.
|
||||
|
||||
This check just stops things from building when the compiler gets
|
||||
upgraded, and it clearly hasn't been maintained in some time. The .so
|
||||
almost certainly still works fine, and if the headers don't, the
|
||||
consuming build will fail anyway.
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
Makefile.am | 6 +++---
|
||||
Makefile.in | 6 +++---
|
||||
src/include/smbios/config/compiler/gcc.hpp | 2 ++
|
||||
src/include/smbios/config/compiler/sunpro_cc.hpp | 4 ++++
|
||||
src/include/smbios/config/compiler/visualc.hpp | 2 ++
|
||||
src/include/smbios_c/config/compiler/gcc.h | 4 ++--
|
||||
src/include/smbios_c/config/compiler/visualc.h | 2 ++
|
||||
7 files changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 99277f6..2395fea 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -17,9 +17,9 @@ lib_LTLIBRARIES=
|
||||
|
||||
TESTS=
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\"
|
||||
-AM_CFLAGS = -Wall
|
||||
-AM_CXXFLAGS = -Wall
|
||||
+AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" -DLIBSMBIOS_BUILD
|
||||
+AM_CFLAGS = -Wall -DLIBSMBIOS_BUILD
|
||||
+AM_CXXFLAGS = -Wall -DLIBSMBIOS_BUILD
|
||||
AM_LDADD = $(LIBINTL)
|
||||
|
||||
AM_LDFLAGS = -L$(top_builddir)/out/
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 660bcfa..db614a5 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -894,9 +894,9 @@ check_SCRIPTS =
|
||||
noinst_LTLIBRARIES = out/libgetopt.la
|
||||
lib_LTLIBRARIES = $(am__append_3) out/libsmbios_c.la
|
||||
TESTS = src/pyunit/runtests.sh $(am__append_27)
|
||||
-AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\"
|
||||
-AM_CFLAGS = -Wall
|
||||
-AM_CXXFLAGS = -Wall
|
||||
+AM_CPPFLAGS = -I$(top_builddir)/out/include -I$(top_srcdir)/src/include -DLIBSMBIOS_LOCALEDIR=\"$(localedir)\" -DLIBSMBIOS_BUILD
|
||||
+AM_CFLAGS = -Wall -DLIBSMBIOS_BUILD
|
||||
+AM_CXXFLAGS = -Wall -DLIBSMBIOS_BUILD
|
||||
AM_LDADD = $(LIBINTL)
|
||||
AM_LDFLAGS = -L$(top_builddir)/out/ $(am__append_1) $(am__append_2)
|
||||
|
||||
diff --git a/src/include/smbios/config/compiler/gcc.hpp b/src/include/smbios/config/compiler/gcc.hpp
|
||||
index 0891255..df0c240 100644
|
||||
--- a/src/include/smbios/config/compiler/gcc.hpp
|
||||
+++ b/src/include/smbios/config/compiler/gcc.hpp
|
||||
@@ -113,6 +113,7 @@
|
||||
# error "Compiler not configured - please reconfigure"
|
||||
#endif
|
||||
//
|
||||
+#ifdef LIBSMBIOS_BUILD
|
||||
#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"
|
||||
@@ -120,5 +121,6 @@
|
||||
# warning "Unknown compiler version - please run the configure tests and report the results"
|
||||
# endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
|
||||
diff --git a/src/include/smbios/config/compiler/sunpro_cc.hpp b/src/include/smbios/config/compiler/sunpro_cc.hpp
|
||||
index 64e5c7e..efee3b2 100644
|
||||
--- a/src/include/smbios/config/compiler/sunpro_cc.hpp
|
||||
+++ b/src/include/smbios/config/compiler/sunpro_cc.hpp
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
// Sun C++ compiler setup:
|
||||
|
||||
+#ifdef LIBSMBIOS_BUILD
|
||||
# if __SUNPRO_CC <= 0x500
|
||||
# define LIBSMBIOS_NO_MEMBER_TEMPLATES
|
||||
# define LIBSMBIOS_NO_FUNCTION_TEMPLATE_ORDERING
|
||||
@@ -68,6 +69,7 @@
|
||||
# if (__SUNPRO_CC <= 0x580)
|
||||
# define LIBSMBIOS_NO_IS_ABSTRACT
|
||||
# endif
|
||||
+#endif
|
||||
|
||||
//
|
||||
// Issues that effect all known versions:
|
||||
@@ -123,11 +125,13 @@
|
||||
#endif
|
||||
//
|
||||
// last known and checked version is 0x590:
|
||||
+#ifdef LIBSMBIOS_BUILD
|
||||
#if (__SUNPRO_CC > 0x590)
|
||||
# if defined(LIBSMBIOS_ASSERT_CONFIG)
|
||||
# error "Unknown compiler version - please run the configure tests and report the results"
|
||||
# endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef UNREFERENCED_PARAMETER
|
||||
#define UNREFERENCED_PARAMETER(P) ((void)(P))
|
||||
diff --git a/src/include/smbios/config/compiler/visualc.hpp b/src/include/smbios/config/compiler/visualc.hpp
|
||||
index 564b09b..d244898 100644
|
||||
--- a/src/include/smbios/config/compiler/visualc.hpp
|
||||
+++ b/src/include/smbios/config/compiler/visualc.hpp
|
||||
@@ -171,6 +171,7 @@
|
||||
#endif
|
||||
//
|
||||
// last known and checked version is 1310:
|
||||
+#ifdef LIBSMBIOS_BUILD
|
||||
#if (_MSC_VER > 1400)
|
||||
# if defined(LIBSMBIOS_ASSERT_CONFIG)
|
||||
# error "Unknown compiler version - please run the configure tests and report the results"
|
||||
@@ -178,3 +179,4 @@
|
||||
# pragma message("Unknown compiler version - please run the configure tests and report the results")
|
||||
# endif
|
||||
#endif
|
||||
+#endif
|
||||
diff --git a/src/include/smbios_c/config/compiler/gcc.h b/src/include/smbios_c/config/compiler/gcc.h
|
||||
index f46b8dc..0d5937e 100644
|
||||
--- a/src/include/smbios_c/config/compiler/gcc.h
|
||||
+++ b/src/include/smbios_c/config/compiler/gcc.h
|
||||
@@ -24,6 +24,7 @@
|
||||
# error "GCC versions < 2.90 not supported"
|
||||
#endif
|
||||
//
|
||||
+#ifdef LIBSMBIOS_BUILD
|
||||
#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 7))
|
||||
# if defined(LIBSMBIOS_C_ASSERT_CONFIG)
|
||||
# error "Unknown compiler version - please run the configure tests and report the results"
|
||||
@@ -31,5 +32,4 @@
|
||||
# warning "Unknown compiler version - please run the configure tests and report the results"
|
||||
# endif
|
||||
#endif
|
||||
-
|
||||
-
|
||||
+#endif
|
||||
diff --git a/src/include/smbios_c/config/compiler/visualc.h b/src/include/smbios_c/config/compiler/visualc.h
|
||||
index 545d4ef..f44ab62 100644
|
||||
--- a/src/include/smbios_c/config/compiler/visualc.h
|
||||
+++ b/src/include/smbios_c/config/compiler/visualc.h
|
||||
@@ -53,6 +53,7 @@
|
||||
#endif
|
||||
//
|
||||
// last known and checked version is 1310:
|
||||
+#ifdef LIBSMBIOS_BUILD
|
||||
#if (_MSC_VER > 1500)
|
||||
# if defined(LIBSMBIOS_C_ASSERT_CONFIG)
|
||||
# error "Unknown compiler version - please run the configure tests and report the results"
|
||||
@@ -60,3 +61,4 @@
|
||||
# pragma message("Unknown compiler version - please run the configure tests and report the results")
|
||||
# endif
|
||||
#endif
|
||||
+#endif
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -105,6 +105,7 @@ 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: 0001-reverting-the-patch-3304b513.patch
|
||||
Patch1: 0001-Don-t-force-the-compiler-version-check-on-consumers-.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}
|
||||
@ -216,6 +217,7 @@ substitutions in yum repository configuration files on Dell systems.
|
||||
: '########################################'
|
||||
%setup -q -n libsmbios-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
find . -type d -exec chmod -f 755 {} \;
|
||||
find doc src -type f -exec chmod -f 644 {} \;
|
||||
chmod 755 src/cppunit/*.sh
|
||||
|
||||
Loading…
Reference in New Issue
Block a user