[packages/mstflint] - disable Werror due to gcc 11 deprecation warnings, rel 3

baggins baggins at pld-linux.org
Tue Oct 5 22:38:29 CEST 2021 

commit de0746b20c80a755f13fdb644e5e798827d8c7d7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 5 22:38:04 2021 +0200

    - disable Werror due to gcc 11 deprecation warnings, rel 3

 gcc11.patch   | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mstflint.spec |   8 ++-
 2 files changed, 216 insertions(+), 1 deletion(-)
---
diff --git a/mstflint.spec b/mstflint.spec
index 94c3890..830dfa3 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -3,13 +3,14 @@ Summary(pl.UTF-8):	Narzędzia modyfikujące firmware i diagnostyczne dla kart HC
 Name:		mstflint
 Version:	4.10.0
 %define	upstream_ver	%{version}-3
-Release:	2
+Release:	3
 License:	BSD or GPL v2
 Group:		Networking/Utilities
 Source0:	https://github.com/Mellanox/mstflint/releases/download/v%{upstream_ver}/%{name}-%{upstream_ver}.tar.gz
 # Source0-md5:	0fd75b78de3fc46d2cf951eead225a5b
 Patch0:		openssl-1.1.patch
 Patch1:		x32.patch
+Patch2:		gcc11.patch
 URL:		https://github.com/Mellanox/mstflint
 BuildRequires:	libibmad-devel
 BuildRequires:	libstdc++-devel
@@ -42,8 +43,13 @@ Pliki nagłówkowe do dostępu do kart HCA/NIC Mellanox.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__automake}
+%{__autoconf}
 %configure \
 	--enable-cs \
 	--enable-fw-mgr \
diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644
index 0000000..e846c96
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,209 @@
+diff -ur mstflint-4.10.0/cmdif/Makefile.am mstflint-4.10.0-gcc11/cmdif/Makefile.am
+--- mstflint-4.10.0/cmdif/Makefile.am	2018-08-28 15:47:44.000000000 +0200
++++ mstflint-4.10.0-gcc11/cmdif/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -37,7 +37,7 @@
+ AM_CPPFLAGS = -I. -I../common -I../tools_layouts  -I${MTCR_DIR} -I.. -I$(USER_DIR)/${MTCR_CONF_DIR}
+ CCMDIF_SO = ccmdif.so
+ 
+-AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC) -DCMDIF_EXPORTS
++AM_CFLAGS = -W -Wall  -g -MP -MD $(COMPILER_FPIC) -DCMDIF_EXPORTS
+ CMDIF_VERSION = 1
+ noinst_LIBRARIES = libcmdif.a
+ 
+diff -ur mstflint-4.10.0/cmdparser/Makefile.am mstflint-4.10.0-gcc11/cmdparser/Makefile.am
+--- mstflint-4.10.0/cmdparser/Makefile.am	2018-08-28 15:47:44.000000000 +0200
++++ mstflint-4.10.0-gcc11/cmdparser/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -34,7 +34,7 @@
+ 
+ INCLUDES = -I. -I../common
+ 
+-AM_CPPFLAGS = -W  -g -MP -MD $(COMPILER_FPIC) -Werror
++AM_CPPFLAGS = -W  -g -MP -MD $(COMPILER_FPIC) 
+ 
+ noinst_LIBRARIES = libcmdparser.a
+ 
+diff -ur mstflint-4.10.0/configure.ac mstflint-4.10.0-gcc11/configure.ac
+--- mstflint-4.10.0/configure.ac	2018-08-28 15:47:44.000000000 +0200
++++ mstflint-4.10.0-gcc11/configure.ac	2021-10-05 22:28:09.544642065 +0200
+@@ -163,8 +163,8 @@
+   LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
+ ])
+ 
+-CFLAGS="$CFLAGS -Werror -DMST_UL"
+-CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
++CFLAGS="$CFLAGS -DMST_UL"
++CXXFLAGS="$CXXFLAGS -DMST_UL"
+ 
+ AC_CONFIG_FILES( mstflint.spec )
+ 
+diff -ur mstflint-4.10.0/ext_libs/iniParser/Makefile.am mstflint-4.10.0-gcc11/ext_libs/iniParser/Makefile.am
+--- mstflint-4.10.0/ext_libs/iniParser/Makefile.am	2018-08-28 15:47:45.000000000 +0200
++++ mstflint-4.10.0-gcc11/ext_libs/iniParser/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -36,7 +36,7 @@
+ MTCR_DIR = $(USER_DIR)/${MTCR_CONFIG_DIR}
+ INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_DIR) -I$(USER_DIR)/common
+ 
+-AM_CFLAGS = -W -Werror -g -MP -MD ${COMPILER_FPIC} 
++AM_CFLAGS = -W  -g -MP -MD ${COMPILER_FPIC} 
+ 
+ noinst_LTLIBRARIES = libiniparser.a
+ 
+diff -ur mstflint-4.10.0/ext_libs/json/Makefile.am mstflint-4.10.0-gcc11/ext_libs/json/Makefile.am
+--- mstflint-4.10.0/ext_libs/json/Makefile.am	2018-08-28 15:47:45.000000000 +0200
++++ mstflint-4.10.0-gcc11/ext_libs/json/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -34,7 +34,7 @@
+ 
+ USER_DIR = ../
+ INCLUDES =
+-AM_CPPFLAGS = -W -Werror -g -MP -MD ${COMPILER_FPIC}
++AM_CPPFLAGS = -W  -g -MP -MD ${COMPILER_FPIC}
+ noinst_LTLIBRARIES = libjson.a
+ libjson_a_SOURCES = json_reader.cpp  json_value.cpp  json_batchallocator.h  json_writer.cpp  json/*.h
+ 
+diff -ur mstflint-4.10.0/ext_libs/minixz/Makefile.am mstflint-4.10.0-gcc11/ext_libs/minixz/Makefile.am
+--- mstflint-4.10.0/ext_libs/minixz/Makefile.am	2018-08-28 15:47:45.000000000 +0200
++++ mstflint-4.10.0-gcc11/ext_libs/minixz/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -34,7 +34,7 @@
+ 
+ USER_DIR = ..
+ INCLUDES = -I.
+-AM_CPPFLAGS = -DXZ_DEC_ANY_CHECK -W  -g -MP -MD ${COMPILER_FPIC} -Werror
++AM_CPPFLAGS = -DXZ_DEC_ANY_CHECK -W  -g -MP -MD ${COMPILER_FPIC} 
+ noinst_LTLIBRARIES = libminixz.a
+ libminixz_a_SOURCES = xz_crc32.c  xz_dec_bcj.c  xz_dec_lzma2.c  xz_dec_stream.c xz_config.h   xz.h xz_lzma2.h    xz_private.h  xz_stream.h
+ 
+diff -ur mstflint-4.10.0/ext_libs/sqlite/Makefile.am mstflint-4.10.0-gcc11/ext_libs/sqlite/Makefile.am
+--- mstflint-4.10.0/ext_libs/sqlite/Makefile.am	2018-08-28 15:47:46.000000000 +0200
++++ mstflint-4.10.0-gcc11/ext_libs/sqlite/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -31,7 +31,7 @@
+ #--
+ # Makefile.am -- Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = -W -Werror -g -MP -MD -DSQLITE_THREADSAFE=0 ${COMPILER_FPIC}
++AM_CFLAGS = -W  -g -MP -MD -DSQLITE_THREADSAFE=0 ${COMPILER_FPIC}
+ 
+ noinst_LIBRARIES = libsqlite3.a
+ noinst_HEADERS = sqlite3.h
+diff -ur mstflint-4.10.0/fw_comps_mgr/Makefile.am mstflint-4.10.0-gcc11/fw_comps_mgr/Makefile.am
+--- mstflint-4.10.0/fw_comps_mgr/Makefile.am	2018-08-28 15:47:47.000000000 +0200
++++ mstflint-4.10.0-gcc11/fw_comps_mgr/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -46,9 +46,9 @@
+ 
+ FWCOMPS_VERSION = 1
+ 
+-AM_CFLAGS = -MD -pipe -Wall -W -Werror $(COMPILER_FPIC)
++AM_CFLAGS = -MD -pipe -Wall -W  $(COMPILER_FPIC)
+ 
+-AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe -Werror $(COMPILER_FPIC)
++AM_CXXFLAGS = -Wall -W -g -MP -MD -pipe  $(COMPILER_FPIC)
+ 
+ noinst_LIBRARIES = libfw_comps_mgr.a
+ 
+diff -ur mstflint-4.10.0/libmfa/Makefile.am mstflint-4.10.0-gcc11/libmfa/Makefile.am
+--- mstflint-4.10.0/libmfa/Makefile.am	2018-08-28 15:47:47.000000000 +0200
++++ mstflint-4.10.0-gcc11/libmfa/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -35,7 +35,7 @@
+ #INCLUDES = -I. -I$(USER_DIR)/ext_libs/libtar -I$(USER_DIR)/ext_libs/libtar/listhash -I$(USER_DIR)/ext_libs/minixz
+ INCLUDES = -I. -I$(USER_DIR)/ext_libs/minixz -I$(USER_DIR)/common
+ 
+-AM_CFLAGS = -MD -pipe -Wall -W  -g -Werror $(COMPILER_FPIC) 
++AM_CFLAGS = -MD -pipe -Wall -W  -g  $(COMPILER_FPIC) 
+ 
+ noinst_LTLIBRARIES = libmfa.a
+ libmfa_a_LIBADD = -L$(USER_DIR)/ext_libs/minixz -lminixz
+diff -ur mstflint-4.10.0/mad_ifc/Makefile.am mstflint-4.10.0-gcc11/mad_ifc/Makefile.am
+--- mstflint-4.10.0/mad_ifc/Makefile.am	2018-08-28 15:47:47.000000000 +0200
++++ mstflint-4.10.0-gcc11/mad_ifc/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -37,7 +37,7 @@
+ 
+ INCLUDES = -I. -I.. -I$(MTCR_INC_DIR) -I../${MTCR_CONF_DIR} -I$(USER_DIR)/tools_ayouts/ 
+ 
+-AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
++AM_CFLAGS = -W -Wall  -g -MP -MD $(COMPILER_FPIC)
+ 
+ 
+ noinst_LIBRARIES = libmad_ifc.a
+diff -ur mstflint-4.10.0/mft_utils/Makefile.am mstflint-4.10.0-gcc11/mft_utils/Makefile.am
+--- mstflint-4.10.0/mft_utils/Makefile.am	2018-08-28 15:47:48.000000000 +0200
++++ mstflint-4.10.0-gcc11/mft_utils/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -34,7 +34,7 @@
+ USER_DIR = $(top_srcdir)
+ AM_CPPFLAGS = -I. -I$(USER_DIR)/common $(COMPILER_FPIC)
+ 
+-AM_CFLAGS = -MD -pipe -Wall -W -Werror $(COMPILER_FPIC)
++AM_CFLAGS = -MD -pipe -Wall -W  $(COMPILER_FPIC)
+ 
+ noinst_HEADERS = mft_sig_handler.h errmsg.h
+ 
+diff -ur mstflint-4.10.0/mlxfwupdate/Makefile.am mstflint-4.10.0-gcc11/mlxfwupdate/Makefile.am
+--- mstflint-4.10.0/mlxfwupdate/Makefile.am	2018-08-28 15:47:49.000000000 +0200
++++ mstflint-4.10.0-gcc11/mlxfwupdate/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -63,7 +63,7 @@
+             -I$(USER_DIR)/mft_utils\
+             -I$(USER_DIR)/dev_mgt
+ 
+-AM_CXXFLAGS = -g -MP -MD -Wall -W -Werror $(BOOST_CXX_IGNORES)
++AM_CXXFLAGS = -g -MP -MD -Wall -W  $(BOOST_CXX_IGNORES)
+ 
+ 
+ common_SOURCEES =  mlxfwmanager_common.cpp mlxfwmanager_common.h\
+diff -ur mstflint-4.10.0/mlxsign_lib/Makefile.am mstflint-4.10.0-gcc11/mlxsign_lib/Makefile.am
+--- mstflint-4.10.0/mlxsign_lib/Makefile.am	2018-08-28 15:47:49.000000000 +0200
++++ mstflint-4.10.0-gcc11/mlxsign_lib/Makefile.am	2021-10-05 22:29:47.516870358 +0200
+@@ -33,7 +33,7 @@
+ # Makefile.am -- Process this file with automake to produce Makefile.in
+ USER_DIR = ..
+ INCLUDES = -I$(USER_DIR) -I$(USER_DIR)/common
+-AM_CFLAGS = -Wall -W -Werror -g -MP -MD -pipe $(COMPILER_FPIC)
++AM_CFLAGS = -Wall -W  -g -MP -MD -pipe $(COMPILER_FPIC)
+ AM_CFLAGS += -DTOOLS_CRYPTO_KEY='$(TOOLS_CRYPTO_KEY)' -DTOOLS_CRYPTO_IV='$(TOOLS_CRYPTO_IV)'
+ 
+ noinst_LIBRARIES = libmlxsign.a
+diff -ur mstflint-4.10.0/mvpd/Makefile.am mstflint-4.10.0-gcc11/mvpd/Makefile.am
+--- mstflint-4.10.0/mvpd/Makefile.am	2018-08-28 15:47:50.000000000 +0200
++++ mstflint-4.10.0-gcc11/mvpd/Makefile.am	2021-10-05 22:29:47.520203656 +0200
+@@ -37,7 +37,7 @@
+ USER_DIR = $(top_srcdir)
+ 
+ AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
+-AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
++AM_CFLAGS = -W -Wall  -g -MP -MD $(COMPILER_FPIC)
+ 
+ noinst_LTLIBRARIES = libmvpd.a
+ 
+diff -ur mstflint-4.10.0/reg_access/Makefile.am mstflint-4.10.0-gcc11/reg_access/Makefile.am
+--- mstflint-4.10.0/reg_access/Makefile.am	2018-08-28 15:47:50.000000000 +0200
++++ mstflint-4.10.0-gcc11/reg_access/Makefile.am	2021-10-05 22:29:47.520203656 +0200
+@@ -38,7 +38,7 @@
+ 
+ AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul
+ 
+-AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC)
++AM_CFLAGS = -W -Wall  -g -MP -MD $(COMPILER_FPIC)
+ 
+ noinst_LTLIBRARIES = libreg_access.a
+ 
+diff -ur mstflint-4.10.0/tools_res_mgmt/Makefile.am mstflint-4.10.0-gcc11/tools_res_mgmt/Makefile.am
+--- mstflint-4.10.0/tools_res_mgmt/Makefile.am	2018-08-28 15:47:51.000000000 +0200
++++ mstflint-4.10.0-gcc11/tools_res_mgmt/Makefile.am	2021-10-05 22:29:47.520203656 +0200
+@@ -35,7 +35,7 @@
+ MTCR_DIR = $(USER_DIR)/include/mtcr_ul
+ AM_CPPFLAGS = -I. -I../common -I$(MTCR_DIR) -I.. -I$(USER_DIR)/${MTCR_CONF_DIR}
+ 
+-AM_CFLAGS = -W -Wall -Werror -g -MP -MD $(COMPILER_FPIC) 
++AM_CFLAGS = -W -Wall  -g -MP -MD $(COMPILER_FPIC) 
+ noinst_LIBRARIES = libtools_res_mgmt.a
+ 
+ libtools_res_mgmt_a_SOURCES = tools_res_mgmt.c tools_time.c
+diff -ur mstflint-4.10.0/xz_utils/Makefile.am mstflint-4.10.0-gcc11/xz_utils/Makefile.am
+--- mstflint-4.10.0/xz_utils/Makefile.am	2018-08-28 15:47:51.000000000 +0200
++++ mstflint-4.10.0-gcc11/xz_utils/Makefile.am	2021-10-05 22:29:47.520203656 +0200
+@@ -35,7 +35,7 @@
+ USER_DIR = ..
+ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
+ INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_DIR) -I$(USER_DIR)/common
+-AM_CFLAGS = -W  -g -MP -MD ${COMPILER_FPIC} -Werror
++AM_CFLAGS = -W  -g -MP -MD ${COMPILER_FPIC} 
+ noinst_LTLIBRARIES = libxz_utils.a
+ libxz_utils_a_SOURCES = xz_utils.c xz_utils.h
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mstflint.git/commitdiff/de0746b20c80a755f13fdb644e5e798827d8c7d7

More information about the pld-cvs-commit mailing list