diff --git a/Add-missing-extern-keywords.patch b/Add-missing-extern-keywords.patch deleted file mode 100644 index 91a18a3..0000000 --- a/Add-missing-extern-keywords.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 1e4e44054a4f092e356611aa207039b2ad357be5 -Author: Nicolas Morey-Chaisemartin -Date: Wed Jan 8 08:19:34 2020 +0100 - - Add missing extern keywords - - Starting from the upcoming GCC release 10, the default of -fcommon option will change to -fno-common: - In C, global variables with multiple tentative definitions will result in linker errors. - Global variable accesses are also more efficient on various targets. - - This fixes compilations errors with -fno-common enabled - - Signed-off-by: Nicolas Morey-Chaisemartin - -diff --git ptl_am/ptl_fwd.h ptl_am/ptl_fwd.h -index e1bd064f82a6..1d0fec4073ab 100644 ---- ptl_am/ptl_fwd.h -+++ ptl_am/ptl_fwd.h -@@ -57,7 +57,7 @@ - #define _PTL_FWD_AMSH_H - - /* Symbol in am ptl */ --struct ptl_ctl_init psmi_ptl_amsh; -+extern struct ptl_ctl_init psmi_ptl_amsh; - - extern int psmi_shm_mq_rv_thresh; - -diff --git ptl_ips/ptl_fwd.h ptl_ips/ptl_fwd.h -index 3702fbae7509..b7742609f3ab 100644 ---- ptl_ips/ptl_fwd.h -+++ ptl_ips/ptl_fwd.h -@@ -61,7 +61,7 @@ typedef struct ips_epaddr ips_epaddr_t; - typedef struct ips_msgctl ips_msgctl_t; - - /* Symbol in ips ptl */ --struct ptl_ctl_init psmi_ptl_ips; -+extern struct ptl_ctl_init psmi_ptl_ips; - --struct ptl_ctl_rcvthread psmi_ptl_ips_rcvthread; -+extern struct ptl_ctl_rcvthread psmi_ptl_ips_rcvthread; - #endif /* _PTL_FWD_IPS_H */ -diff --git ptl_self/ptl_fwd.h ptl_self/ptl_fwd.h -index 77ee7f95f782..7ee6b732a3ff 100644 ---- ptl_self/ptl_fwd.h -+++ ptl_self/ptl_fwd.h -@@ -57,6 +57,6 @@ - #define _PTL_FWD_SELF_H - - /* Symbol in am ptl */ --struct ptl_ctl_init psmi_ptl_self; -+extern struct ptl_ctl_init psmi_ptl_self; - - #endif diff --git a/_service b/_service index 551a19c..90998c3 100644 --- a/_service +++ b/_service @@ -5,11 +5,11 @@ no .git libpsm2 - 11.2.86 + 11.2.166 PSM2_(.*) \1 PSM2_* - 4f0ad8cf4d6b44fcce5f745e946a056659ba54c0 + 6d5af3c8766ae8e86f96ba7d04d5941966a5630c libpsm2*.tar diff --git a/libpsm2-11.2.166.tar.bz2 b/libpsm2-11.2.166.tar.bz2 new file mode 100644 index 0000000..39885c6 --- /dev/null +++ b/libpsm2-11.2.166.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d2ecb3888294970c9a23280706f8d1adfb888354d5d87e475eb9e58ff479870 +size 362260 diff --git a/libpsm2-11.2.86.tar.bz2 b/libpsm2-11.2.86.tar.bz2 deleted file mode 100644 index 114d4d0..0000000 --- a/libpsm2-11.2.86.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f5f091f214a9a7eb24b55b593aab8850494c36f6b84d6e041eedf94bb1c79e2 -size 363532 diff --git a/libpsm2.changes b/libpsm2.changes index 5c3925f..64380af 100644 --- a/libpsm2.changes +++ b/libpsm2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 3 08:04:50 UTC 2020 - Nicolas Morey-Chaisemartin + +- Update to 11.2.166 + - No release notes available +- Drop Add-missing-extern-keywords.patch as it was merged upstream + ------------------------------------------------------------------- Fri Jun 5 10:45:37 UTC 2020 - Callum Farmer diff --git a/libpsm2.spec b/libpsm2.spec index f536adb..ce34251 100644 --- a/libpsm2.spec +++ b/libpsm2.spec @@ -20,7 +20,7 @@ %define psm_so 2 Name: libpsm2 -Version: 11.2.86 +Version: 11.2.166 Release: 0 Summary: Intel PSM Messaging API libraries License: BSD-2-Clause OR GPL-2.0-only @@ -31,7 +31,6 @@ Source1: libpsm2.changelog Source2: libpsm2-rpmlintrc Patch2: libpsm2-use_RPM_OPT_FLAGS.patch Patch3: libpsm2-use-exported-variable-for-version-and-release.patch -Patch4: Add-missing-extern-keywords.patch BuildRequires: libnuma-devel BuildRequires: libuuid-devel BuildRequires: pkg-config @@ -85,7 +84,6 @@ Support for MPIs linked with PSM versions < 2. %setup -q -n %{name}-%{version}%{git_ver} %patch2 %patch3 -%patch4 cp %{S:1} ChangeLog