Compare commits
No commits in common. 'c9' and 'i10c-beta' have entirely different histories.
@ -1 +1 @@
|
||||
SOURCES/mpich-4.1.1.tar.gz
|
||||
SOURCES/mpich-4.1.2.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
9ac613543e9b53d278196339674499ca71914283 SOURCES/mpich-4.1.1.tar.gz
|
||||
6c82e540519509d3fb661bd4ccba906273e5102d SOURCES/mpich-4.1.2.tar.gz
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 8f0c71281b5dccd70a3f1d4204e3cc6bc7201ceb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
|
||||
<zbyszek@arm03-packager01.cloud.fedoraproject.org>
|
||||
Date: Wed, 28 Aug 2019 10:57:55 +0000
|
||||
Subject: [PATCH] Drop real128
|
||||
|
||||
https://github.com/pmodels/mpich/issues/4005
|
||||
---
|
||||
.../fortran/use_mpi_f08/mpi_f08_types.f90 | 24 -------------------
|
||||
1 file changed, 24 deletions(-)
|
||||
|
||||
diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90 b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
|
||||
index f8b0fa811..46bdf6972 100644
|
||||
--- a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
|
||||
+++ b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
|
||||
@@ -248,10 +248,8 @@ interface MPI_Sizeof
|
||||
module procedure MPI_Sizeof_xint64
|
||||
module procedure MPI_Sizeof_xreal32
|
||||
module procedure MPI_Sizeof_xreal64
|
||||
- module procedure MPI_Sizeof_xreal128
|
||||
module procedure MPI_Sizeof_xcomplex32
|
||||
module procedure MPI_Sizeof_xcomplex64
|
||||
- module procedure MPI_Sizeof_xcomplex128
|
||||
end interface
|
||||
|
||||
private :: MPI_Sizeof_character
|
||||
@@ -263,10 +261,8 @@ private :: MPI_Sizeof_xint32
|
||||
private :: MPI_Sizeof_xint64
|
||||
private :: MPI_Sizeof_xreal32
|
||||
private :: MPI_Sizeof_xreal64
|
||||
-private :: MPI_Sizeof_xreal128
|
||||
private :: MPI_Sizeof_xcomplex32
|
||||
private :: MPI_Sizeof_xcomplex64
|
||||
-private :: MPI_Sizeof_xcomplex128
|
||||
|
||||
contains
|
||||
|
||||
@@ -350,16 +346,6 @@ subroutine MPI_Sizeof_xreal64 (x, size, ierror)
|
||||
ierror = 0
|
||||
end subroutine MPI_Sizeof_xreal64
|
||||
|
||||
-subroutine MPI_Sizeof_xreal128 (x, size, ierror)
|
||||
- use,intrinsic :: iso_fortran_env, only: real128
|
||||
- real(real128),dimension(..) :: x
|
||||
- integer, intent(out) :: size
|
||||
- integer, optional, intent(out) :: ierror
|
||||
-
|
||||
- size = storage_size(x)/8
|
||||
- ierror = 0
|
||||
-end subroutine MPI_Sizeof_xreal128
|
||||
-
|
||||
subroutine MPI_Sizeof_xcomplex32 (x, size, ierror)
|
||||
use,intrinsic :: iso_fortran_env, only: real32
|
||||
complex(real32),dimension(..) :: x
|
||||
@@ -380,16 +366,6 @@ subroutine MPI_Sizeof_xcomplex64 (x, size, ierror)
|
||||
ierror = 0
|
||||
end subroutine MPI_Sizeof_xcomplex64
|
||||
|
||||
-subroutine MPI_Sizeof_xcomplex128 (x, size, ierror)
|
||||
- use,intrinsic :: iso_fortran_env, only: real128
|
||||
- complex(real128),dimension(..) :: x
|
||||
- integer, intent(out) :: size
|
||||
- integer, optional, intent(out) :: ierror
|
||||
-
|
||||
- size = storage_size(x)/8
|
||||
- ierror = 0
|
||||
-end subroutine MPI_Sizeof_xcomplex128
|
||||
-
|
||||
subroutine MPI_Status_f2f08(f_status, f08_status, ierror)
|
||||
integer, intent(in) :: f_status(MPI_STATUS_SIZE)
|
||||
type(MPI_Status), intent(out) :: f08_status
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
From cb3e5715326c43779b51e1cab1519282c50199c1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||
Date: Tue, 8 Feb 2022 10:19:12 +0100
|
||||
Subject: [PATCH 1/4] pkgconf: remove optimization and link flags from pkgconf
|
||||
file
|
||||
|
||||
Those flags are generally something "private" to a particular build. If we build
|
||||
mpich with -O2, it does not mean that some other program using the library should
|
||||
be built with -O2.
|
||||
|
||||
In package builds in Fedora we ended up with:
|
||||
|
||||
WRAPPER_LDFLAGS = -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -Wl,-dT,/builddir/build/BUILD/mpich-3.4.1/.package_note-mpich-3.4.1-11.fc36.x86_64.ld -Lsystem/lib
|
||||
|
||||
WRAPPER_CFLAGS = -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
|
||||
|
||||
None of those are appropriate to be exported to dependent projects.
|
||||
For https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects.
|
||||
---
|
||||
src/packaging/pkgconfig/mpich.pc.in | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/packaging/pkgconfig/mpich.pc.in b/src/packaging/pkgconfig/mpich.pc.in
|
||||
index e905ff2e20..ff6dc35807 100644
|
||||
--- a/src/packaging/pkgconfig/mpich.pc.in
|
||||
+++ b/src/packaging/pkgconfig/mpich.pc.in
|
||||
@@ -9,12 +9,12 @@ Description: High Performance and portable MPI
|
||||
Version: @MPICH_VERSION@
|
||||
URL: http://www.mcs.anl.gov/research/projects/mpich
|
||||
Requires:
|
||||
-Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@
|
||||
-Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
|
||||
+Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
|
||||
+Cflags: @WRAPPER_CPPFLAGS@ -I${includedir}
|
||||
|
||||
# pkg-config does not understand Cxxflags, etc. So we allow users to
|
||||
# query them using the --variable option
|
||||
|
||||
-cxxflags=@WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
|
||||
-fflags=@WRAPPER_FFLAGS@ -I${includedir}
|
||||
-fcflags=@WRAPPER_FCFLAGS@ -I${includedir}
|
||||
+cxxflags=@WRAPPER_CPPFLAGS@ -I${includedir}
|
||||
+fflags=-I${includedir}
|
||||
+fcflags=-I${includedir}
|
||||
@ -0,0 +1,25 @@
|
||||
From 03b024ee9346babc48a646b6ab98884ebdd49791 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||
Date: Tue, 8 Feb 2022 10:45:41 +0100
|
||||
Subject: [PATCH 2/4] pkgconf: also drop rpath flags from pkgconf file
|
||||
|
||||
When environment modules are used, libraries are resolved using normal
|
||||
linker search options. The rpath argument here is actually completely
|
||||
wrong in that case.
|
||||
---
|
||||
src/packaging/pkgconfig/mpich.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/packaging/pkgconfig/mpich.pc.in b/src/packaging/pkgconfig/mpich.pc.in
|
||||
index ff6dc35807..5ad7e8bcbc 100644
|
||||
--- a/src/packaging/pkgconfig/mpich.pc.in
|
||||
+++ b/src/packaging/pkgconfig/mpich.pc.in
|
||||
@@ -9,7 +9,7 @@ Description: High Performance and portable MPI
|
||||
Version: @MPICH_VERSION@
|
||||
URL: http://www.mcs.anl.gov/research/projects/mpich
|
||||
Requires:
|
||||
-Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
|
||||
+Libs: -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@
|
||||
Cflags: @WRAPPER_CPPFLAGS@ -I${includedir}
|
||||
|
||||
# pkg-config does not understand Cxxflags, etc. So we allow users to
|
||||
@ -0,0 +1,148 @@
|
||||
From 695102787fde0b3adb3917b12b97f8c49f7f57a5 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 2 Mar 2023 17:50:52 -0700
|
||||
Subject: [PATCH 3/3] Drop build flags, e.g. -specs... and -lto from mpi
|
||||
wrappers (mpicc and mpicxx)
|
||||
|
||||
For discussion see:
|
||||
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/7TFWEKTDWBYBHEGMIWBVI3AVGORZGNBS/
|
||||
---
|
||||
src/env/mpicc.bash.in | 8 ++++----
|
||||
src/env/mpicc.sh.in | 8 ++++----
|
||||
src/env/mpicxx.bash.in | 8 ++++----
|
||||
src/env/mpicxx.sh.in | 8 ++++----
|
||||
src/env/mpifort.bash.in | 6 +++---
|
||||
src/env/mpifort.sh.in | 6 +++---
|
||||
6 files changed, 22 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in
|
||||
index 3fc695f..d8659e5 100644
|
||||
--- a/src/env/mpicc.bash.in
|
||||
+++ b/src/env/mpicc.bash.in
|
||||
@@ -247,13 +247,13 @@ if [ -n "$profConf" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
-final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
|
||||
-final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
||||
-final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||
+final_cflags="@MPICH_MPICC_CFLAGS@"
|
||||
+final_cppflags="@MPICH_MPICC_CPPFLAGS@"
|
||||
+final_ldflags="@MPICH_MPICC_LDFLAGS@"
|
||||
final_libs="@MPICH_MPICC_LIBS@"
|
||||
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
||||
final_ldflags="${final_ldflags} @LDFLAGS@"
|
||||
- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
|
||||
+ final_libs="${final_libs}"
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------------------------
|
||||
diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in
|
||||
index 99a8c90..e093907 100644
|
||||
--- a/src/env/mpicc.sh.in
|
||||
+++ b/src/env/mpicc.sh.in
|
||||
@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
-final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@"
|
||||
-final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
||||
-final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||
+final_cflags="@MPICH_MPICC_CFLAGS@"
|
||||
+final_cppflags="@MPICH_MPICC_CPPFLAGS@"
|
||||
+final_ldflags="@MPICH_MPICC_LDFLAGS@"
|
||||
final_libs="@MPICH_MPICC_LIBS@"
|
||||
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
||||
final_ldflags="${final_ldflags} @LDFLAGS@"
|
||||
- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
|
||||
+ final_libs="${final_libs}"
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------------------------
|
||||
diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in
|
||||
index 29566ba..acf897b 100644
|
||||
--- a/src/env/mpicxx.bash.in
|
||||
+++ b/src/env/mpicxx.bash.in
|
||||
@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
-final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
|
||||
-final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
||||
-final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||
+final_cxxflags="@MPICH_MPICXX_CXXFLAGS@"
|
||||
+final_cppflags="@MPICH_MPICXX_CPPFLAGS@"
|
||||
+final_ldflags="@MPICH_MPICXX_LDFLAGS@"
|
||||
final_libs="@MPICH_MPICXX_LIBS@"
|
||||
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
||||
final_ldflags="${final_ldflags} @LDFLAGS@"
|
||||
- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
|
||||
+ final_libs="${final_libs}"
|
||||
fi
|
||||
|
||||
# A temporary statement to invoke the compiler
|
||||
diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in
|
||||
index 0b830fe..36c2486 100644
|
||||
--- a/src/env/mpicxx.sh.in
|
||||
+++ b/src/env/mpicxx.sh.in
|
||||
@@ -259,13 +259,13 @@ if [ -n "$profConf" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
-final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@"
|
||||
-final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@"
|
||||
-final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||
+final_cxxflags="@MPICH_MPICXX_CXXFLAGS@"
|
||||
+final_cppflags="@MPICH_MPICXX_CPPFLAGS@"
|
||||
+final_ldflags="@MPICH_MPICXX_LDFLAGS@"
|
||||
final_libs="@MPICH_MPICXX_LIBS@"
|
||||
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
||||
final_ldflags="${final_ldflags} @LDFLAGS@"
|
||||
- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
|
||||
+ final_libs="${final_libs}"
|
||||
fi
|
||||
|
||||
# A temporary statement to invoke the compiler
|
||||
diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in
|
||||
index 5312aea..c1e557b 100644
|
||||
--- a/src/env/mpifort.bash.in
|
||||
+++ b/src/env/mpifort.bash.in
|
||||
@@ -335,12 +335,12 @@ elif [ -n "$FCMODINC" ] ; then
|
||||
FCMODDIRS="${FCMODINC}$modincdir"
|
||||
fi
|
||||
|
||||
-final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
|
||||
-final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||
+final_fcflags="@MPICH_MPIFORT_FCFLAGS@"
|
||||
+final_ldflags="@MPICH_MPIFORT_LDFLAGS@"
|
||||
final_libs="@MPICH_MPIFORT_LIBS@"
|
||||
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
||||
final_ldflags="${final_ldflags} @LDFLAGS@"
|
||||
- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
|
||||
+ final_libs="${final_libs}"
|
||||
fi
|
||||
|
||||
extra_f77_flags="@WRAPPER_EXTRA_F77_FLAGS@"
|
||||
diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in
|
||||
index 902b0f7..95c1232 100644
|
||||
--- a/src/env/mpifort.sh.in
|
||||
+++ b/src/env/mpifort.sh.in
|
||||
@@ -352,12 +352,12 @@ elif [ -n "$FCMODINC" ] ; then
|
||||
FCMODDIRS="${FCMODINC}$modincdir"
|
||||
fi
|
||||
|
||||
-final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@"
|
||||
-final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||
+final_fcflags="@MPICH_MPIFORT_FCFLAGS@"
|
||||
+final_ldflags="@MPICH_MPIFORT_LDFLAGS@"
|
||||
final_libs="@MPICH_MPIFORT_LIBS@"
|
||||
if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then
|
||||
final_ldflags="${final_ldflags} @LDFLAGS@"
|
||||
- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__"
|
||||
+ final_libs="${final_libs}"
|
||||
fi
|
||||
|
||||
extra_f77_flags="@WRAPPER_EXTRA_F77_FLAGS@"
|
||||
--
|
||||
2.40.0.rc1
|
||||
|
||||
@ -0,0 +1,124 @@
|
||||
aclocal_cc.m4: Remove use of implicit int from weak symbol checks
|
||||
|
||||
Implicit int is no longer part of the C language since the 1999
|
||||
revision.
|
||||
|
||||
Submitted upstream: <https://github.com/pmodels/mpich/pull/6301>
|
||||
|
||||
diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/confdb/aclocal_cc.m4
|
||||
+++ b/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
diff --git a/modules/json-c/autoconf-archive/m4/aclocal_cc.m4 b/modules/json-c/autoconf-archive/m4/aclocal_cc.m4
|
||||
index 8a1552d..cd28a4f 100644
|
||||
--- a/modules/json-c/autoconf-archive/m4/aclocal_cc.m4
|
||||
+++ b/modules/json-c/autoconf-archive/m4/aclocal_cc.m4
|
||||
@@ -383,7 +383,7 @@ extern int pfoo_(int);
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
-int Foo(a) { return a; }
|
||||
+int Foo(int a) { return a; }
|
||||
])
|
||||
],[
|
||||
AC_LANG_SOURCE([
|
||||
diff --git a/modules/yaksa/m4/aclocal_cc.m4 b/modules/yaksa/m4/aclocal_cc.m4
|
||||
index d15d674..9fcf485 100644
|
||||
--- a/modules/yaksa/m4/aclocal_cc.m4
|
||||
+++ b/modules/yaksa/m4/aclocal_cc.m4
|
||||
@@ -422,7 +422,7 @@ extern int pfoo_(int);
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
-int Foo(a) { return a; }
|
||||
+int Foo(int a) { return a; }
|
||||
])
|
||||
],[
|
||||
AC_LANG_SOURCE([
|
||||
diff --git a/src/mpi/romio/confdb/aclocal_cc.m4 b/src/mpi/romio/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/src/mpi/romio/confdb/aclocal_cc.m4
|
||||
+++ b/src/mpi/romio/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
diff --git a/src/mpi/romio/mpl/confdb/aclocal_cc.m4 b/src/mpi/romio/mpl/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/src/mpi/romio/mpl/confdb/aclocal_cc.m4
|
||||
+++ b/src/mpi/romio/mpl/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
diff --git a/src/mpl/confdb/aclocal_cc.m4 b/src/mpl/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/src/mpl/confdb/aclocal_cc.m4
|
||||
+++ b/src/mpl/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
diff --git a/src/pm/hydra/confdb/aclocal_cc.m4 b/src/pm/hydra/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/src/pm/hydra/confdb/aclocal_cc.m4
|
||||
+++ b/src/pm/hydra/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
diff --git a/test/mpi/confdb/aclocal_cc.m4 b/test/mpi/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/test/mpi/confdb/aclocal_cc.m4
|
||||
+++ b/test/mpi/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
diff --git a/test/mpi/dtpools/confdb/aclocal_cc.m4 b/test/mpi/dtpools/confdb/aclocal_cc.m4
|
||||
index a85e082..2710ada 100644
|
||||
--- a/test/mpi/dtpools/confdb/aclocal_cc.m4
|
||||
+++ b/test/mpi/dtpools/confdb/aclocal_cc.m4
|
||||
@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s
|
||||
#pragma weak PFoo_ = Foo
|
||||
#pragma weak pfoo_ = Foo
|
||||
int Foo(int);
|
||||
- int Foo(a) { return a; }
|
||||
+ int Foo(int a) { return a; }
|
||||
]])],[AC_LANG_SOURCE([[
|
||||
extern int PFoo(int), PFoo_(int), pfoo_(int);
|
||||
int main() {
|
||||
@ -0,0 +1,18 @@
|
||||
Remove spurious argument to AC_CHECK_ALIGNOF, which caused this
|
||||
configure test to fail.
|
||||
|
||||
Submitted upstream: <https://github.com/pmodels/mpich/pull/6302>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3e2aa2cb7e828675..f76eb49833bb358c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2701,7 +2701,7 @@ if test "$MPID_NO_FLOAT16" != "yes" ; then
|
||||
fi
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
-AC_CHECK_ALIGNOF([max_align_t],[0],[#include <stddef.h>])
|
||||
+AC_CHECK_ALIGNOF([max_align_t],[#include <stddef.h>])
|
||||
|
||||
if test "$ac_cv_alignof_max_align_t" != "0" ; then
|
||||
AC_DEFINE_UNQUOTED(MAX_ALIGNMENT,$ac_cv_alignof_max_align_t,[Controls byte alignment of structures (for aligning allocated structures)])
|
||||
@ -0,0 +1,17 @@
|
||||
Do not call undeclared exit function in __thread support check
|
||||
|
||||
Submitted upstream: <https://github.com/pmodels/json-c/pull/2>
|
||||
|
||||
diff --git a/modules/json-c/configure.ac b/modules/json-c/configure.ac
|
||||
index 9eb80bcf1c1d2e62..1511d7def23e8c39 100644
|
||||
--- a/modules/json-c/configure.ac
|
||||
+++ b/modules/json-c/configure.ac
|
||||
@@ -69,7 +69,7 @@ AC_CACHE_CHECK([for __thread support], ac_cv___thread, [dnl
|
||||
AC_LINK_IFELSE([dnl
|
||||
AC_LANG_PROGRAM([[#undef __thread
|
||||
static __thread int a; int foo (int b) { return a + b; }]],
|
||||
- [[exit (foo (0));]])],
|
||||
+ [[return foo (0);]])],
|
||||
ac_cv___thread=yes, ac_cv___thread=no)
|
||||
])
|
||||
AS_IF([test "x$ac_cv___thread" != xno],
|
||||
@ -1 +0,0 @@
|
||||
import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))
|
||||
Loading…
Reference in new issue