[packages/opensm-plugin-ssa] - fix building with gcc 10+, rediff patch, rel 4

baggins baggins at pld-linux.org
Thu Oct 28 22:13:58 CEST 2021


commit 3d1b9ed0021deb5d80d0c96a4f34f24be4cfd0da
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 28 22:13:32 2021 +0200

    - fix building with gcc 10+, rediff patch, rel 4

 gcc10.patch             | 11 +++++++++++
 libopensmssa-link.patch |  9 +++++----
 opensm-plugin-ssa.spec  |  4 +++-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/opensm-plugin-ssa.spec b/opensm-plugin-ssa.spec
index e9fdb36..82e18c6 100644
--- a/opensm-plugin-ssa.spec
+++ b/opensm-plugin-ssa.spec
@@ -2,12 +2,13 @@ Summary:	SSA plugin library (libopensmssa) for OpenSM
 Summary(pl.UTF-8):	Biblioteka wtyczki SSA (libopensmssa) dla OpenSM
 Name:		opensm-plugin-ssa
 Version:	0.0.9
-Release:	3
+Release:	4
 License:	BSD or GPL v2
 Group:		Libraries
 Source0:	https://www.openfabrics.org/downloads/management/ssa/libopensmssa-%{version}.tar.gz
 # Source0-md5:	316dd88c1330e9131d031b2e1f80b40e
 Patch0:		libopensmssa-link.patch
+Patch1:		gcc10.patch
 URL:		https://www.openfabrics.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -34,6 +35,7 @@ Biblioteka wtyczki SSA (libopensmssa) dla OpenSM.
 %prep
 %setup -q -n libopensmssa-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644
index 0000000..d01adb5
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,11 @@
+--- libopensmssa-0.0.9/include/common.h~	2015-08-13 14:52:31.000000000 +0200
++++ libopensmssa-0.0.9/include/common.h	2021-10-28 22:12:21.101976018 +0200
+@@ -357,7 +357,7 @@
+ 
+ uint64_t ssa_epoch_inc(uint64_t epoch);
+ 
+-const char *month_str[12];
++extern const char *month_str[12];
+ void ssa_write_date(FILE *stream, time_t tim, unsigned int usec);
+ void ssa_format_addr(char *str, size_t str_size,
+ 		     enum ssa_addr_type addr_type, const uint8_t *addr, size_t addr_size);
diff --git a/libopensmssa-link.patch b/libopensmssa-link.patch
index c8cace2..52e43fc 100644
--- a/libopensmssa-link.patch
+++ b/libopensmssa-link.patch
@@ -1,6 +1,7 @@
---- libopensmssa-0.0.8/Makefile.am.orig	2015-01-16 17:39:28.000000000 +0100
-+++ libopensmssa-0.0.8/Makefile.am	2015-02-24 21:30:00.035705736 +0100
-@@ -26,7 +26,7 @@
+diff -urNp -x '*.orig' libopensmssa-0.0.9.org/Makefile.am libopensmssa-0.0.9/Makefile.am
+--- libopensmssa-0.0.9.org/Makefile.am	2015-08-13 14:52:31.000000000 +0200
++++ libopensmssa-0.0.9/Makefile.am	2021-10-28 22:11:05.589241410 +0200
+@@ -26,7 +26,7 @@ src_libopensmssa_la_SOURCES = src/core.c
  src_libopensmssa_la_LDFLAGS = -version-info 1 -export-dynamic \
  		$(libopensmssa_version_script)
  src_libopensmssa_la_DEPENDENCIES = $(srcdir)/libopensmssa.map
@@ -8,4 +9,4 @@
 +src_libopensmssa_la_LIBADD = -lrdmacm -lpthread -L$(libdir) -lopensm -losmcomp \
  		$(GLIB_LIBS)
  
- # headers are distributed as part of the include dir
+ man_MANS = \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/opensm-plugin-ssa.git/commitdiff/3d1b9ed0021deb5d80d0c96a4f34f24be4cfd0da



More information about the pld-cvs-commit mailing list