p96705831
/
openmpi
forked from openkylin/openmpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
luoyaoming 2022-11-01 14:46:01 +08:00 committed by cckylin-cibot
parent dd2dce49aa
commit 318ef387be
13 changed files with 354 additions and 10524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
debian/patches/build_hurd vendored
View File

@ -1,77 +1,31 @@
Description: Fix build problems on hurd-i386 From: Pino Toscano <pino@debian.org>
This patch allows Open MPI to build on Debian GNU/HURD. Date: Tue, 1 Nov 2022 06:57:10 +0000
. Subject: Fix build problems on hurd-i386
Also, the memory:linux MCA component is disabled, since its use of POSIX API
in malloc hooks called very early at startup causes troubles.
.
Also changes by Samuel Thibault <sthibault@debian.org>
See bugs.debian.org/846965
Author: Pino Toscano <pino@debian.org>
Forwarded: partially Forwarded: partially
Last-Update: 2018-10-24 Last-Update: 2018-10-24
Index: openmpi-4.1.0/opal/util/stacktrace.c This patch allows Open MPI to build on Debian GNU/HURD.
===================================================================
--- openmpi-4.1.0.orig/opal/util/stacktrace.c Also, the memory:linux MCA component is disabled, since its use of POSIX API
+++ openmpi-4.1.0/opal/util/stacktrace.c in malloc hooks called very early at startup causes troubles.
@@ -588,8 +588,12 @@ int opal_util_register_stackhandlers (vo
Also changes by Samuel Thibault <sthibault@debian.org>
/* Setup the signals to catch */ See bugs.debian.org/846965
memset(&act, 0, sizeof(act)); ---
+#ifdef SA_SIGINFO ompi/include/ompi_config.h | 4 ++++
act.sa_sigaction = show_stackframe; ompi/mca/fbtl/posix/fbtl_posix_preadv.c | 4 ++++
act.sa_flags = SA_SIGINFO; ompi/mca/fbtl/posix/fbtl_posix_pwritev.c | 4 ++++
+#else opal/mca/base/mca_base_var.c | 8 ++++++++
+ act.sa_handler = show_stackframe_handler; opal/util/stacktrace.c | 4 ++++
+#endif orte/include/orte_config.h | 7 +++++++
#ifdef SA_ONESHOT orte/mca/odls/base/odls_base_default_fns.c | 14 +++++++++++++-
act.sa_flags |= SA_ONESHOT; 7 files changed, 44 insertions(+), 1 deletion(-)
#else
Index: openmpi-4.1.0/orte/mca/odls/base/odls_base_default_fns.c diff --git a/ompi/include/ompi_config.h b/ompi/include/ompi_config.h
=================================================================== index a7a2c1f..2428dde 100644
--- openmpi-4.1.0.orig/orte/mca/odls/base/odls_base_default_fns.c --- a/ompi/include/ompi_config.h
+++ openmpi-4.1.0/orte/mca/odls/base/odls_base_default_fns.c +++ b/ompi/include/ompi_config.h
@@ -859,7 +859,11 @@ static int setup_path(orte_app_context_t
* again not match getcwd! This is beyond our control - we are only
* ensuring they start out matching.
*/
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ basedir = get_current_dir_name();
+#else
getcwd(dir, sizeof(dir));
+#endif
*wdir = strdup(dir);
opal_setenv("PWD", dir, true, &app->env);
/* update the initial wdir value too */
@@ -1068,7 +1072,11 @@ void orte_odls_base_default_launch_local
orte_app_context_t *app;
orte_proc_t *child=NULL;
int rc=ORTE_SUCCESS;
- char basedir[MAXPATHLEN];
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ char *basedir=NULL;
+#else
+ char basedir[MAXPATHLEN];
+#endif
int j, idx;
int total_num_local_procs = 0;
orte_odls_launch_local_t *caddy = (orte_odls_launch_local_t*)cbdata;
@@ -2064,7 +2072,11 @@ int orte_odls_base_default_restart_proc(
* bouncing around as we execute this app, but we will always return
* to this place as our default directory
*/
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ basedir = get_current_dir_name();
+#else
getcwd(basedir, sizeof(basedir));
+#endif
/* find this child's jobdat */
if (NULL == (jobdat = orte_get_job_data_object(child->name.jobid))) {
Index: openmpi-4.1.0/ompi/include/ompi_config.h
===================================================================
--- openmpi-4.1.0.orig/ompi/include/ompi_config.h
+++ openmpi-4.1.0/ompi/include/ompi_config.h
@@ -28,6 +28,10 @@ @@ -28,6 +28,10 @@
#include "opal_config.h" #include "opal_config.h"
@ -83,10 +37,40 @@ Index: openmpi-4.1.0/ompi/include/ompi_config.h
#define OMPI_IDENT_STRING OPAL_IDENT_STRING #define OMPI_IDENT_STRING OPAL_IDENT_STRING
/*********************************************************************** /***********************************************************************
Index: openmpi-4.1.0/opal/mca/base/mca_base_var.c diff --git a/ompi/mca/fbtl/posix/fbtl_posix_preadv.c b/ompi/mca/fbtl/posix/fbtl_posix_preadv.c
=================================================================== index 89a819a..8b522bb 100644
--- openmpi-4.1.0.orig/opal/mca/base/mca_base_var.c --- a/ompi/mca/fbtl/posix/fbtl_posix_preadv.c
+++ openmpi-4.1.0/opal/mca/base/mca_base_var.c +++ b/ompi/mca/fbtl/posix/fbtl_posix_preadv.c
@@ -32,6 +32,10 @@
static ssize_t mca_fbtl_posix_preadv_datasieving (ompio_file_t *fh);
static ssize_t mca_fbtl_posix_preadv_generic (ompio_file_t *fh);
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+
ssize_t mca_fbtl_posix_preadv (ompio_file_t *fh )
{
ssize_t bytes_read=0, ret_code=0;
diff --git a/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c b/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c
index d54e9e0..89098fc 100644
--- a/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c
+++ b/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c
@@ -33,6 +33,10 @@
static ssize_t mca_fbtl_posix_pwritev_datasieving (ompio_file_t *fh );
static ssize_t mca_fbtl_posix_pwritev_generic (ompio_file_t *fh );
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif
+
ssize_t mca_fbtl_posix_pwritev(ompio_file_t *fh )
{
ssize_t bytes_written=0, ret_code=0;
diff --git a/opal/mca/base/mca_base_var.c b/opal/mca/base/mca_base_var.c
index d409296..a1291a2 100644
--- a/opal/mca/base/mca_base_var.c
+++ b/opal/mca/base/mca_base_var.c
@@ -51,6 +51,14 @@ @@ -51,6 +51,14 @@
#include "opal/util/opal_environ.h" #include "opal/util/opal_environ.h"
#include "opal/runtime/opal.h" #include "opal/runtime/opal.h"
@ -102,10 +86,27 @@ Index: openmpi-4.1.0/opal/mca/base/mca_base_var.c
/* /*
* local variables * local variables
*/ */
Index: openmpi-4.1.0/orte/include/orte_config.h diff --git a/opal/util/stacktrace.c b/opal/util/stacktrace.c
=================================================================== index 3a36d15..9b4a2a0 100644
--- openmpi-4.1.0.orig/orte/include/orte_config.h --- a/opal/util/stacktrace.c
+++ openmpi-4.1.0/orte/include/orte_config.h +++ b/opal/util/stacktrace.c
@@ -588,8 +588,12 @@ int opal_util_register_stackhandlers (void)
/* Setup the signals to catch */
memset(&act, 0, sizeof(act));
+#ifdef SA_SIGINFO
act.sa_sigaction = show_stackframe;
act.sa_flags = SA_SIGINFO;
+#else
+ act.sa_handler = show_stackframe_handler;
+#endif
#ifdef SA_ONESHOT
act.sa_flags |= SA_ONESHOT;
#else
diff --git a/orte/include/orte_config.h b/orte/include/orte_config.h
index 9c951b7..6ec28d0 100644
--- a/orte/include/orte_config.h
+++ b/orte/include/orte_config.h
@@ -26,6 +26,13 @@ @@ -26,6 +26,13 @@
#include "opal_config.h" #include "opal_config.h"
@ -120,33 +121,44 @@ Index: openmpi-4.1.0/orte/include/orte_config.h
#define ORTE_IDENT_STRING OPAL_IDENT_STRING #define ORTE_IDENT_STRING OPAL_IDENT_STRING
# if OPAL_C_HAVE_VISIBILITY # if OPAL_C_HAVE_VISIBILITY
Index: openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_preadv.c diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c
=================================================================== index 8db35a6..8f92dc4 100644
--- openmpi-4.1.0.orig/ompi/mca/fbtl/posix/fbtl_posix_preadv.c --- a/orte/mca/odls/base/odls_base_default_fns.c
+++ openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_preadv.c +++ b/orte/mca/odls/base/odls_base_default_fns.c
@@ -32,6 +32,10 @@ @@ -856,7 +856,11 @@ static int setup_path(orte_app_context_t *app, char **wdir)
static ssize_t mca_fbtl_posix_preadv_datasieving (ompio_file_t *fh); * again not match getcwd! This is beyond our control - we are only
static ssize_t mca_fbtl_posix_preadv_generic (ompio_file_t *fh); * ensuring they start out matching.
*/
+#ifndef IOV_MAX +#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+#define IOV_MAX 1024 + basedir = get_current_dir_name();
+#else
getcwd(dir, sizeof(dir));
+#endif
*wdir = strdup(dir);
opal_setenv("PWD", dir, true, &app->env);
/* update the initial wdir value too */
@@ -1065,7 +1069,11 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
orte_app_context_t *app;
orte_proc_t *child=NULL;
int rc=ORTE_SUCCESS;
- char basedir[MAXPATHLEN];
+#if !defined(MAXPATHLEN) && defined(__GLIBC__)
+ char *basedir=NULL;
+#else
+ char basedir[MAXPATHLEN];
+#endif +#endif
+ int j, idx;
ssize_t mca_fbtl_posix_preadv (ompio_file_t *fh ) int total_num_local_procs = 0;
{ orte_odls_launch_local_t *caddy = (orte_odls_launch_local_t*)cbdata;
ssize_t bytes_read=0, ret_code=0; @@ -2061,7 +2069,11 @@ int orte_odls_base_default_restart_proc(orte_proc_t *child,
Index: openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c * bouncing around as we execute this app, but we will always return
=================================================================== * to this place as our default directory
--- openmpi-4.1.0.orig/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c */
+++ openmpi-4.1.0/ompi/mca/fbtl/posix/fbtl_posix_pwritev.c +#if !defined(MAXPATHLEN) && defined(__GLIBC__)
@@ -33,6 +33,10 @@ + basedir = get_current_dir_name();
static ssize_t mca_fbtl_posix_pwritev_datasieving (ompio_file_t *fh ); +#else
static ssize_t mca_fbtl_posix_pwritev_generic (ompio_file_t *fh ); getcwd(basedir, sizeof(basedir));
+#ifndef IOV_MAX
+#define IOV_MAX 1024
+#endif +#endif
+
ssize_t mca_fbtl_posix_pwritev(ompio_file_t *fh ) /* find this child's jobdat */
{ if (NULL == (jobdat = orte_get_job_data_object(child->name.jobid))) {
ssize_t bytes_written=0, ret_code=0;

16
debian/patches/fix-underlinking.patch vendored
View File

@ -1,14 +1,20 @@
From: Graham Inggs <ginggs@debian.org>
Date: Tue, 1 Nov 2022 06:57:10 +0000
Subject: fix-underlinking
Desciption: Fix underlinking Desciption: Fix underlinking
Prevents symbol lookup error: ../openmpi4/mca_mtl_ofi.so: Prevents symbol lookup error: ../openmpi4/mca_mtl_ofi.so:
undefined symbol: fi_dupinfo when linked with --as-needed undefined symbol: fi_dupinfo when linked with --as-needed
Bug-Debian: https://bugs.debian.org/899104 Bug-Debian: https://bugs.debian.org/899104
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2018-05-23 Last-Update: 2018-05-23
---
ompi/mca/mtl/ofi/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: openmpi-4.1.0/ompi/mca/mtl/ofi/Makefile.am diff --git a/ompi/mca/mtl/ofi/Makefile.am b/ompi/mca/mtl/ofi/Makefile.am
=================================================================== index 832e2b8..e084c7b 100644
--- openmpi-4.1.0.orig/ompi/mca/mtl/ofi/Makefile.am --- a/ompi/mca/mtl/ofi/Makefile.am
+++ openmpi-4.1.0/ompi/mca/mtl/ofi/Makefile.am +++ b/ompi/mca/mtl/ofi/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-# -#
+ +

150
debian/patches/hppa.patch vendored
View File

@ -1,14 +1,29 @@
Author: Helge Deller <deller@gmx.de> From: Helge Deller <deller@gmx.de>
Description: Support for the HPPA architecture Date: Tue, 1 Nov 2022 06:57:10 +0000
Subject: Support for the HPPA architecture
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776730 Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776730
Last-Updated: 2016-09-04 Last-Updated: 2016-09-04
Forwarded: no Forwarded: no
---
config/opal_config_asm.m4 | 6 +++
opal/include/opal/sys/architecture.h | 1 +
opal/include/opal/sys/atomic.h | 2 +
opal/include/opal/sys/hppa/Makefile.am | 23 ++++++++
opal/include/opal/sys/hppa/atomic.h | 95 ++++++++++++++++++++++++++++++++++
opal/include/opal/sys/hppa/timer.h | 33 ++++++++++++
opal/include/opal/sys/timer.h | 2 +
opal/mca/timer/linux/configure.m4 | 2 +-
8 files changed, 163 insertions(+), 1 deletion(-)
create mode 100644 opal/include/opal/sys/hppa/Makefile.am
create mode 100644 opal/include/opal/sys/hppa/atomic.h
create mode 100644 opal/include/opal/sys/hppa/timer.h
Index: openmpi-4.1.0/config/opal_config_asm.m4 diff --git a/config/opal_config_asm.m4 b/config/opal_config_asm.m4
=================================================================== index 5183c7e..2a84d51 100644
--- openmpi-4.1.0.orig/config/opal_config_asm.m4 --- a/config/opal_config_asm.m4
+++ openmpi-4.1.0/config/opal_config_asm.m4 +++ b/config/opal_config_asm.m4
@@ -1104,6 +1104,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[ @@ -1111,6 +1111,12 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
[AC_MSG_ERROR([No atomic primitives available for $host])]) [AC_MSG_ERROR([No atomic primitives available for $host])])
;; ;;
@ -21,10 +36,10 @@ Index: openmpi-4.1.0/config/opal_config_asm.m4
mips-*|mips64*) mips-*|mips64*)
# Should really find some way to make sure that we are on # Should really find some way to make sure that we are on
# a MIPS III machine (r4000 and later) # a MIPS III machine (r4000 and later)
Index: openmpi-4.1.0/opal/include/opal/sys/architecture.h diff --git a/opal/include/opal/sys/architecture.h b/opal/include/opal/sys/architecture.h
=================================================================== index ee9aa96..45e485c 100644
--- openmpi-4.1.0.orig/opal/include/opal/sys/architecture.h --- a/opal/include/opal/sys/architecture.h
+++ openmpi-4.1.0/opal/include/opal/sys/architecture.h +++ b/opal/include/opal/sys/architecture.h
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#define OPAL_X86_64 0030 #define OPAL_X86_64 0030
#define OPAL_POWERPC32 0050 #define OPAL_POWERPC32 0050
@ -33,10 +48,53 @@ Index: openmpi-4.1.0/opal/include/opal/sys/architecture.h
#define OPAL_SPARC 0060 #define OPAL_SPARC 0060
#define OPAL_SPARCV9_32 0061 #define OPAL_SPARCV9_32 0061
#define OPAL_SPARCV9_64 0062 #define OPAL_SPARCV9_64 0062
Index: openmpi-4.1.0/opal/include/opal/sys/hppa/atomic.h diff --git a/opal/include/opal/sys/atomic.h b/opal/include/opal/sys/atomic.h
=================================================================== index 3b165f0..4e36876 100644
--- a/opal/include/opal/sys/atomic.h
+++ b/opal/include/opal/sys/atomic.h
@@ -169,6 +169,8 @@ enum {
#include "opal/sys/ia32/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
#include "opal/sys/ia64/atomic.h"
+#elif OPAL_ASSEMBLY_ARCH == OPAL_HPPA
+#include "opal/sys/hppa/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
#include "opal/sys/mips/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32
diff --git a/opal/include/opal/sys/hppa/Makefile.am b/opal/include/opal/sys/hppa/Makefile.am
new file mode 100644
index 0000000..3154816
--- /dev/null --- /dev/null
+++ openmpi-4.1.0/opal/include/opal/sys/hppa/atomic.h +++ b/opal/include/opal/sys/hppa/Makefile.am
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# University Research and Technology
+# Corporation. All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+# of Tennessee Research Foundation. All rights
+# reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+# University of Stuttgart. All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+# All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from opal/include/Makefile.am
+
+headers += \
+ opal/sys/hppa/atomic.h \
+ opal/sys/hppa/timer.h
diff --git a/opal/include/opal/sys/hppa/atomic.h b/opal/include/opal/sys/hppa/atomic.h
new file mode 100644
index 0000000..3862618
--- /dev/null
+++ b/opal/include/opal/sys/hppa/atomic.h
@@ -0,0 +1,95 @@ @@ -0,0 +1,95 @@
+/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
+/* +/*
@ -133,38 +191,11 @@ Index: openmpi-4.1.0/opal/include/opal/sys/hppa/atomic.h
+#define OPAL_HAVE_ATOMIC_CMPSET_64 0 +#define OPAL_HAVE_ATOMIC_CMPSET_64 0
+ +
+#endif /* ! OPAL_SYS_ARCH_ATOMIC_H */ +#endif /* ! OPAL_SYS_ARCH_ATOMIC_H */
Index: openmpi-4.1.0/opal/include/opal/sys/hppa/Makefile.am diff --git a/opal/include/opal/sys/hppa/timer.h b/opal/include/opal/sys/hppa/timer.h
=================================================================== new file mode 100644
index 0000000..6e3eb94
--- /dev/null --- /dev/null
+++ openmpi-4.1.0/opal/include/opal/sys/hppa/Makefile.am +++ b/opal/include/opal/sys/hppa/timer.h
@@ -0,0 +1,23 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+# University Research and Technology
+# Corporation. All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+# of Tennessee Research Foundation. All rights
+# reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+# University of Stuttgart. All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+# All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# This makefile.am does not stand on its own - it is included from opal/include/Makefile.am
+
+headers += \
+ opal/sys/hppa/atomic.h \
+ opal/sys/hppa/timer.h
Index: openmpi-4.1.0/opal/include/opal/sys/hppa/timer.h
===================================================================
--- /dev/null
+++ openmpi-4.1.0/opal/include/opal/sys/hppa/timer.h
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
+/* +/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
@ -199,10 +230,10 @@ Index: openmpi-4.1.0/opal/include/opal/sys/hppa/timer.h
+#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0 +#define OPAL_HAVE_SYS_TIMER_GET_CYCLES 0
+ +
+#endif /* ! OPAL_SYS_ARCH_TIMER_H */ +#endif /* ! OPAL_SYS_ARCH_TIMER_H */
Index: openmpi-4.1.0/opal/include/opal/sys/timer.h diff --git a/opal/include/opal/sys/timer.h b/opal/include/opal/sys/timer.h
=================================================================== index 4ce2810..6065963 100644
--- openmpi-4.1.0.orig/opal/include/opal/sys/timer.h --- a/opal/include/opal/sys/timer.h
+++ openmpi-4.1.0/opal/include/opal/sys/timer.h +++ b/opal/include/opal/sys/timer.h
@@ -90,6 +90,8 @@ BEGIN_C_DECLS @@ -90,6 +90,8 @@ BEGIN_C_DECLS
#include "opal/sys/sparcv9/timer.h" #include "opal/sys/sparcv9/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS #elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
@ -212,10 +243,10 @@ Index: openmpi-4.1.0/opal/include/opal/sys/timer.h
#endif #endif
#ifndef DOXYGEN #ifndef DOXYGEN
Index: openmpi-4.1.0/opal/mca/timer/linux/configure.m4 diff --git a/opal/mca/timer/linux/configure.m4 b/opal/mca/timer/linux/configure.m4
=================================================================== index 5ec7b01..6ecfb48 100644
--- openmpi-4.1.0.orig/opal/mca/timer/linux/configure.m4 --- a/opal/mca/timer/linux/configure.m4
+++ openmpi-4.1.0/opal/mca/timer/linux/configure.m4 +++ b/opal/mca/timer/linux/configure.m4
@@ -47,7 +47,7 @@ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[ @@ -47,7 +47,7 @@ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[
[timer_linux_happy="no"])]) [timer_linux_happy="no"])])
@ -225,16 +256,3 @@ Index: openmpi-4.1.0/opal/mca/timer/linux/configure.m4
AS_IF([test "$timer_linux_happy" = "yes"], AS_IF([test "$timer_linux_happy" = "yes"],
[AS_IF([test -r "/proc/cpuinfo"], [AS_IF([test -r "/proc/cpuinfo"],
[timer_linux_happy="yes"], [timer_linux_happy="yes"],
Index: openmpi-4.1.0/opal/include/opal/sys/atomic.h
===================================================================
--- openmpi-4.1.0.orig/opal/include/opal/sys/atomic.h
+++ openmpi-4.1.0/opal/include/opal/sys/atomic.h
@@ -169,6 +169,8 @@ enum {
#include "opal/sys/ia32/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA64
#include "opal/sys/ia64/atomic.h"
+#elif OPAL_ASSEMBLY_ARCH == OPAL_HPPA
+#include "opal/sys/hppa/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_MIPS
#include "opal/sys/mips/atomic.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_POWERPC32

12
debian/patches/ia64.patch vendored
View File

@ -1,6 +1,16 @@
From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Tue, 1 Nov 2022 06:57:10 +0000
Subject: ia64
---
opal/include/opal/sys/timer.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/opal/include/opal/sys/timer.h b/opal/include/opal/sys/timer.h
index 6065963..5eaa778 100644
--- a/opal/include/opal/sys/timer.h --- a/opal/include/opal/sys/timer.h
+++ b/opal/include/opal/sys/timer.h +++ b/opal/include/opal/sys/timer.h
@@ -78,8 +78,6 @@ @@ -78,8 +78,6 @@ BEGIN_C_DECLS
#include "opal/sys/arm64/timer.h" #include "opal/sys/arm64/timer.h"
#elif OPAL_ASSEMBLY_ARCH == OPAL_IA32 #elif OPAL_ASSEMBLY_ARCH == OPAL_IA32
#include "opal/sys/ia32/timer.h" #include "opal/sys/ia32/timer.h"

21
debian/patches/libdir.patch vendored
View File

@ -1,15 +1,20 @@
Author: Alastair McKinstry <mckinstry@debian.org> From: Alastair McKinstry <mckinstry@debian.org>
Description: Change install libdir to openmpi3 Date: Tue, 1 Nov 2022 06:57:10 +0000
This is needed to ensure that libopenmpi2, libopenmpi3 do not collide. Subject: Change install libdir to openmpi3
Last-Updated: 2019-03-09 Last-Updated: 2019-03-09
Forwarded: no Forwarded: no
This is needed to ensure that libopenmpi2, libopenmpi3 do not collide.
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: openmpi-4.1.0/configure.ac diff --git a/configure.ac b/configure.ac
=================================================================== index a272023..9f1a506 100644
--- openmpi-4.1.0.orig/configure.ac --- a/configure.ac
+++ openmpi-4.1.0/configure.ac +++ b/configure.ac
@@ -1444,11 +1444,13 @@ esac @@ -1427,11 +1427,13 @@ esac
# easier to deal with the problem of opal, orte, and ompi built from # easier to deal with the problem of opal, orte, and ompi built from
# their own tarballs, with their own PACKAGE variables. # their own tarballs, with their own PACKAGE variables.
opaldatadir='${datadir}/openmpi' opaldatadir='${datadir}/openmpi'

96
debian/patches/manpage_macros vendored
View File

@ -1,15 +1,38 @@
Description: Fix problems in manpages From: Alastair McKinstry <mckinstry@debian.org>
In some man page headers, a macro (-*-) is used which makes lintian Date: Tue, 1 Nov 2022 06:57:10 +0000
choke and probably should not be there anyway. Subject: Fix problems in manpages
Author: Alastair McKinstry <mckinstry@debian.org>
Forwarded: no Forwarded: no
Last-Update: 2018-04-08 Last-Update: 2018-04-08
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_info.3in In some man page headers, a macro (-*-) is used which makes lintian
=================================================================== choke and probably should not be there anyway.
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_T_enum_get_info.3in ---
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_info.3in ompi/mpi/man/man3/MPI_Get.3in | 2 +-
@@ -32,7 +32,7 @@ Length of the string and/or buffer for n ompi/mpi/man/man3/MPI_T_enum_get_info.3in | 2 +-
ompi/mpi/man/man3/MPI_T_enum_get_item.3in | 2 +-
ompi/mpi/man/man3/MPI_T_pvar_get_info.3in | 2 +-
orte/mca/sstore/orte_sstore.7in | 3 +--
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ompi/mpi/man/man3/MPI_Get.3in b/ompi/mpi/man/man3/MPI_Get.3in
index 991834c..430778e 100644
--- a/ompi/mpi/man/man3/MPI_Get.3in
+++ b/ompi/mpi/man/man3/MPI_Get.3in
@@ -104,7 +104,7 @@ window object used for communication (handle)
.SH OUTPUT PARAMETER
.ft R
-.TP li
+.TP 1i
request
MPI_Rget: RMA request
.TP 1i
diff --git a/ompi/mpi/man/man3/MPI_T_enum_get_info.3in b/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
index 7317256..1d18978 100644
--- a/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
+++ b/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
@@ -32,7 +32,7 @@ Length of the string and/or buffer for name.
.SH OUTPUT PARAMETERS .SH OUTPUT PARAMETERS
.ft R .ft R
@ -18,10 +41,23 @@ Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_info.3in
num num
number of discrete values represented by this enumeration. number of discrete values represented by this enumeration.
.TP 1i .TP 1i
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in diff --git a/ompi/mpi/man/man3/MPI_T_enum_get_item.3in b/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
=================================================================== index 86c22e9..3919610 100644
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in --- a/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in +++ b/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
@@ -36,7 +36,7 @@ Length of the string and/or buffer for name.
.SH OUTPUT PARAMETERS
.ft R
-.TP li
+.TP 1i
value
Variable value.
.TP 1i
diff --git a/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in b/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
index 86e7dba..0519bbf 100644
--- a/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
+++ b/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
@@ -131,7 +131,7 @@ MPI_T_PVAR_CLASS_GENERIC @@ -131,7 +131,7 @@ MPI_T_PVAR_CLASS_GENERIC
Variable does not fit into any other class. Can by represented by an type supported by the MPI tool Variable does not fit into any other class. Can by represented by an type supported by the MPI tool
information interface (see DATATYPE). Starting value is variable specific. information interface (see DATATYPE). Starting value is variable specific.
@ -31,36 +67,10 @@ Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_pvar_get_info.3in
.SH DATATYPE .SH DATATYPE
.ft R .ft R
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_Get.3in diff --git a/orte/mca/sstore/orte_sstore.7in b/orte/mca/sstore/orte_sstore.7in
=================================================================== index dc777fd..45e2ea8 100644
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_Get.3in --- a/orte/mca/sstore/orte_sstore.7in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_Get.3in +++ b/orte/mca/sstore/orte_sstore.7in
@@ -104,7 +104,7 @@ window object used for communication (ha
.SH OUTPUT PARAMETER
.ft R
-.TP li
+.TP 1i
request
MPI_Rget: RMA request
.TP 1i
Index: openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
===================================================================
--- openmpi-4.1.0.orig/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
+++ openmpi-4.1.0/ompi/mpi/man/man3/MPI_T_enum_get_item.3in
@@ -36,7 +36,7 @@ Length of the string and/or buffer for n
.SH OUTPUT PARAMETERS
.ft R
-.TP li
+.TP 1i
value
Variable value.
.TP 1i
Index: openmpi-4.1.0/orte/mca/sstore/orte_sstore.7in
===================================================================
--- openmpi-4.1.0.orig/orte/mca/sstore/orte_sstore.7in
+++ openmpi-4.1.0/orte/mca/sstore/orte_sstore.7in
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
.\" ************************** .\" **************************
.SH NAME .SH NAME

17
debian/patches/mpifort.patch vendored
View File

@ -1,7 +1,16 @@
Index: openmpi-4.0.2/ompi/tools/wrappers/mpifort-wrapper-data.txt.in From: Openkylin Developers <packaging@lists.openkylin.top>
Date: Tue, 1 Nov 2022 06:57:10 +0000
Subject: mpifort
=================================================================== ===================================================================
--- openmpi-4.0.2.orig/ompi/tools/wrappers/mpifort-wrapper-data.txt.in ---
+++ openmpi-4.0.2/ompi/tools/wrappers/mpifort-wrapper-data.txt.in ompi/tools/wrappers/mpifort-wrapper-data.txt.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
index 27a7c05..c57bf07 100644
--- a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
+++ b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
@@ -12,6 +12,7 @@ language=Fortran @@ -12,6 +12,7 @@ language=Fortran
compiler_env=FC compiler_env=FC
compiler_flags_env=FCFLAGS compiler_flags_env=FCFLAGS
@ -10,7 +19,7 @@ Index: openmpi-4.0.2/ompi/tools/wrappers/mpifort-wrapper-data.txt.in
preprocessor_flags= preprocessor_flags=
compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@ compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@
linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@ linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@
@@ -24,5 +25,5 @@ libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @@ -24,5 +25,5 @@ libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMP
dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@ dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=lib@OMPI_LIBMPI_NAME@.a static_lib_file=lib@OMPI_LIBMPI_NAME@.a
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@ required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

18
debian/patches/no-warning-unused.patch vendored
View File

@ -1,11 +1,19 @@
Description: Turn off warning that openfabric is not available From: Alastair McKinstry <mckinstry@debian.org>
because it breaks some overlying layers/appications in Debian. Date: Tue, 1 Nov 2022 06:57:10 +0000
Also exclude openfabric/openib by default. Subject: Turn off warning that openfabric is not available
See: #979041
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2021-09-02 Last-Updated: 2021-09-02
Forwarded: not-needed Forwarded: not-needed
because it breaks some overlying layers/appications in Debian.
Also exclude openfabric/openib by default.
See: #979041
---
opal/etc/openmpi-mca-params.conf | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/opal/etc/openmpi-mca-params.conf b/opal/etc/openmpi-mca-params.conf
index 09c1ac3..4e2b244 100644
--- a/opal/etc/openmpi-mca-params.conf --- a/opal/etc/openmpi-mca-params.conf
+++ b/opal/etc/openmpi-mca-params.conf +++ b/opal/etc/openmpi-mca-params.conf
@@ -57,3 +57,14 @@ @@ -57,3 +57,14 @@

24
debian/patches/opal_fifo.patch vendored
View File

@ -1,17 +1,23 @@
Description: fix test-suite to build on ppc64el From: Thibaut Paumard <thibaut@debian.org>
Test suite hangs on ppc64el. This is due to a bug in test/class/opal_fifo.c. Date: Tue, 1 Nov 2022 06:57:10 +0000
thread_test() must end with pthread_exit(NULL), not return NULL. Subject: fix test-suite to build on ppc64el
Author: Thibaut Paumard <thibaut@debian.org>
Origin: Vendor Origin: Vendor
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848218 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848218
Forwarded: no Forwarded: no
Last-Update: 2016-12-15 Last-Update: 2016-12-15
Test suite hangs on ppc64el. This is due to a bug in test/class/opal_fifo.c.
thread_test() must end with pthread_exit(NULL), not return NULL.
Last-Update: 2016-12-15
--- ---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ test/class/opal_fifo.c | 2 +-
Index: openmpi-4.1.0/test/class/opal_fifo.c 1 file changed, 1 insertion(+), 1 deletion(-)
===================================================================
--- openmpi-4.1.0.orig/test/class/opal_fifo.c diff --git a/test/class/opal_fifo.c b/test/class/opal_fifo.c
+++ openmpi-4.1.0/test/class/opal_fifo.c index 122524a..ca9cb7e 100644
--- a/test/class/opal_fifo.c
+++ b/test/class/opal_fifo.c
@@ -63,7 +63,7 @@ static void *thread_test (void *arg) { @@ -63,7 +63,7 @@ static void *thread_test (void *arg) {
printf ("Atomics thread finished. Time: %d s %d us %d nsec/poppush\n", (int) total.tv_sec, printf ("Atomics thread finished. Time: %d s %d us %d nsec/poppush\n", (int) total.tv_sec,
(int)total.tv_usec, (int)(timing / 1e-9)); (int)total.tv_usec, (int)(timing / 1e-9));

17
debian/patches/pkg-config.patch vendored
View File

@ -1,12 +1,17 @@
Description: Enable non-gfortran compilation From: Alastair McKinstry <mckinstry@debian.org>
Author: Alastair McKinstry <mckinstry@debian.org> Date: Tue, 1 Nov 2022 06:57:10 +0000
Subject: Enable non-gfortran compilation
Last-Updated: 2020-01-13 Last-Updated: 2020-01-13
Forwarded: no Forwarded: no
---
ompi/tools/wrappers/ompi-fort.pc.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: openmpi-4.0.2/ompi/tools/wrappers/ompi-fort.pc.in diff --git a/ompi/tools/wrappers/ompi-fort.pc.in b/ompi/tools/wrappers/ompi-fort.pc.in
=================================================================== index 5635870..7441395 100644
--- openmpi-4.0.2.orig/ompi/tools/wrappers/ompi-fort.pc.in --- a/ompi/tools/wrappers/ompi-fort.pc.in
+++ openmpi-4.0.2/ompi/tools/wrappers/ompi-fort.pc.in +++ b/ompi/tools/wrappers/ompi-fort.pc.in
@@ -11,11 +11,15 @@ exec_prefix=@exec_prefix@ @@ -11,11 +11,15 @@ exec_prefix=@exec_prefix@
includedir=@includedir@ includedir=@includedir@
libdir=@libdir@ libdir=@libdir@

1
debian/patches/series vendored
View File

@ -7,6 +7,5 @@ hppa.patch
opal_fifo.patch opal_fifo.patch
verbose-ompi-rules.patch verbose-ompi-rules.patch
fix-underlinking.patch fix-underlinking.patch
#version-script.patch
no-warning-unused.patch no-warning-unused.patch
ia64.patch ia64.patch

17
debian/patches/verbose-ompi-rules.patch vendored
View File

@ -1,10 +1,15 @@
Description: Makefile.ompi-rules: don't set silent building From: Adrian Bunk <bunk@debian.org>
Author: Adrian Bunk <bunk@debian.org> Date: Tue, 1 Nov 2022 06:57:10 +0000
Subject: Makefile.ompi-rules: don't set silent building
Index: openmpi-4.1.0/Makefile.ompi-rules ---
=================================================================== Makefile.ompi-rules | 2 +-
--- openmpi-4.1.0.orig/Makefile.ompi-rules 1 file changed, 1 insertion(+), 1 deletion(-)
+++ openmpi-4.1.0/Makefile.ompi-rules
diff --git a/Makefile.ompi-rules b/Makefile.ompi-rules
index d7e1041..f5e3acb 100644
--- a/Makefile.ompi-rules
+++ b/Makefile.ompi-rules
@@ -53,7 +53,7 @@ endif @@ -53,7 +53,7 @@ endif
# A little verbosity magic; "make" will show the terse output. "make # A little verbosity magic; "make" will show the terse output. "make
# V=1" will show the actual commands used (just like the other # V=1" will show the actual commands used (just like the other

10263
debian/patches/version-script.patch vendored
View File

File diff suppressed because it is too large Load Diff