!2 infinipath-psm: Fixed build error

Merge pull request !2 from gnaygnil/master

adjust-base-cflags.patch

@@ -1,7 +1,8 @@
-diff -uprN psm-3.3_raw/buildflags.mak psm-3.3/buildflags.mak
+diff --git a/buildflags.mak b/buildflags.mak.old
---- psm-3.3_raw/buildflags.mak	2014-08-21 04:00:18.000000000 +0800
+index 34fdf1c..2c229cb 100644
-+++ psm-3.3/buildflags.mak	2020-03-13 21:37:04.912463946 +0800
+--- a/buildflags.mak
-@@ -94,7 +94,8 @@ ifeq (1,${PSM_USE_SYS_UUID})
++++ b/buildflags.mak.old
+@@ -94,5 +94,6 @@ ifeq (1,${PSM_USE_SYS_UUID})
  endif
  
  CFLAGS += $(BASECFLAGS) $(if $(filter $(CC),gcc),-Wno-strict-aliasing) \
@@ -9,5 +10,3 @@ diff -uprN psm-3.3_raw/buildflags.mak psm-3.3/buildflags.mak
 +	$(if $(PSM_VALGRIND:0=),-DPSM_VALGRIND,-DNVALGRIND) \
 +	-Wno-maybe-uninitialized -Wno-implicit-function-declaration
  
- .DEFAULT_GOAL := all
- # Dummy install rule for sub-directories that don't install anything

infinipath-psm.spec

@@ -1,10 +1,10 @@
 Name:           infinipath-psm
 Version:        3.3
-Release:        7
+Release:        8
 License:        GPLv2 or BSD
 Summary:        Libraries for Intel Performance Scaled Messaging
 URL:            https://github.com/01org/psm
-Source0:        https://github.com/intel/psm/archive/v3.3.tar.gz
+Source0:        infinipath-psm-3.3-22_g4abbc60_open.tar.gz
 ExclusiveArch:  x86_64
 BuildRequires:  libuuid-devel
 Obsoletes:      infinipath-libs <= %{version}-%{release}
@@ -42,15 +42,15 @@ Requires(postun): /sbin/ldconfig
 Development files for Intel PSM.
 
 %prep
-%autosetup -n psm-%{version} -p1
+%autosetup -n infinipath-psm-%{version}-22_g4abbc60_open -p1
 find libuuid -type f -not -name 'psm_uuid.[c|h]' -not -name Makefile -exec rm -f '{}' \;
 
 %build
 %{set_build_flags}
-%make_build PSM_USE_SYS_UUID=1 %{PSM_HAVE_SCIF=0 MIC=0} CC=gcc
+%make_build PSM_USE_SYS_UUID=1 PSM_HAVE_SCIF=0 MIC=0 CC=gcc
 
 %install
-%make_install %{PSM_HAVE_SCIF=0 MIC=0}
+%make_install PSM_HAVE_SCIF=0 MIC=0
 install -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-ipath.rules
 
@@ -76,5 +76,8 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/60-ipath.rule
 %{_includedir}/{psm.h,psm_mq.h}
 
 %changelog
+* Mon Mar 16 2020 Ling Yang <lingyang2@huawei.com> - 3.3-8
+- Fixed build error
+
 * Fri Mar 13 2020 Ling Yang <lingyang2@huawei.com> - 3.3-7
 - Package Init

misleading-indentation.patch

@@ -1,7 +1,8 @@
-diff -uprN psm-3.3_raw/psm_diags.c psm-3.3/psm_diags.c
+diff --git a/psm_diags.c b/psm_diags.c
---- psm-3.3_raw/psm_diags.c	2014-08-21 04:00:18.000000000 +0800
+index 3e2df9d..3714cea 100644
-+++ psm-3.3/psm_diags.c	2020-03-13 21:35:28.340564067 +0800
+--- a/psm_diags.c
-@@ -280,10 +280,11 @@ memcpy_check_size (memcpy_fn_t fn, int *
++++ b/psm_diags.c
+@@ -281,10 +281,11 @@ memcpy_check_size (memcpy_fn_t fn, int *p, int *f, size_t n)
    if (USE_MALLOC) {
      src = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
      dst = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
@@ -13,4 +14,4 @@ diff -uprN psm-3.3_raw/psm_diags.c psm-3.3/psm_diags.c
 +    }
    }
    else {
-     void *src_p, *dst_p;
+     void *src_p = NULL, *dst_p = NULL;