Skip to content

Commit acc6c74

Browse files
brianjmurrellbrianjmurrell
authored
CORCI-762 build: Build on Leap 15 (#17)
Add Leap 15 build Packaging-branch: bmurrell/multi-spec Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
1 parent b641675 commit acc6c74

12 files changed

+766
-137
lines changed

‎0001-Drop-GCC-check.patch‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
diff -Nrua autogen.sh autogen.sh
2+
--- autogen.sh
3+
+++ autogen.sh
4+
@@ -506,7 +506,7 @@
5+
6+
echo_n "Checking for automake version... "
7+
recreate_tmp
8+
-ver=1.15
9+
+ver=1.13
10+
cat > .tmp/configure.ac<<EOF
11+
AC_INIT(testver,1.0)
12+
AC_CONFIG_AUX_DIR([m4])
13+
@@ -544,7 +544,7 @@
14+
15+
echo_n "Checking for libtool version... "
16+
recreate_tmp
17+
-ver=2.4.4
18+
+ver=2.4.2
19+
cat <<EOF >.tmp/configure.ac
20+
AC_INIT(testver,1.0)
21+
AC_CONFIG_AUX_DIR([m4])
22+
diff -Nrua src/binding/cxx/buildiface src/binding/cxx/buildiface
23+
--- src/binding/cxx/buildiface
24+
+++ src/binding/cxx/buildiface
25+
@@ -1454,21 +1454,6 @@
26+
#endif\n\n";
27+
}
28+
29+
- # GCC changed the calling convention between 3.2.3 and 3.4.3 (!!!)
30+
- # check for that
31+
- print $OUTFD "
32+
-// Check for incompatible GCC versions
33+
-// GCC (specifically) g++ changed the calling convention
34+
-// between 3.2.3 and 3.4.3 (!!) Normally such changes
35+
-// should only occur at major releases (e.g., version 3 to 4)
36+
-#ifdef __GNUC__
37+
-# if __GNUC__ >= \@GNUCXX_VERSION\@
38+
-# if __GNUC_MINOR__ > 2 && \@GNUCXX_MINORVERSION\@ == 2
39+
-# error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
40+
-# endif
41+
-# endif
42+
-#endif\n";
43+
-
44+
print $OUTFD "
45+
/*
46+
* Because the API is defined, some methods have parameters that are

‎Jenkinsfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
// no debian/ support yet
4444
// no pmix for leap15 yet
45-
packageBuildingPipeline(['distros' : ['centos7'],
45+
packageBuildingPipeline(['distros' : ['centos7', 'leap15'],
4646
'publish_branch': 'daos_adio-rpm',
47-
'make args' : '-f Makefile-rpm.mk'])
47+
'make args' : '-f Makefile-rpm.mk',
48+
'rpmlint_check': false])

‎Makefile-rpm.mk‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
NAME := mpich
22
SRC_EXT := gz
3-
SOURCE = https://www.mpich.org/static/downloads/$(VERSION)/$(NAME)-$(VERSION).tar.$(SRC_EXT)
4-
PATCHES := mpich.macros mpich.pth.py2 mpich.pth.py3 mpich-modules.patch fix-version.patch
5-
# 0003-soften-version-check.patch daos_adio.patch \
6-
# daos_adio-hwloc.patch daos_adio-izem.patch daos_adio-ucx.patch \
7-
# daos_adio-libfabric.patch
8-
# daos_adio-all.patch
9-
PR_REPOS := automake libtool
3+
4+
EL_7_PR_REPOS := automake libtool
105

116
GIT_TAG := v3.3
127

@@ -111,3 +106,9 @@ $(NAME)-$(DL_VERSION).tar.$(SRC_EXT): $(NAME)-$(DL_VERSION)-$(GIT_COMMIT).tar
111106
fi
112107
rm -f $@
113108
gzip < $< > $@
109+
110+
mpich.spec: FORCE
111+
rm -f mpich.spec
112+
ln mpich-$(DISTRO_BASE).spec $@
113+
114+
FORCE:

‎_multibuild‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<multibuild>
2+
<package>standard</package>
3+
<package>testsuite</package>
4+
<package>ofi</package>
5+
<package>ofi-testsuite</package>
6+
<package>gnu-hpc</package>
7+
<package>gnu-hpc-testsuite</package>
8+
<package>gnu-hpc-ofi</package>
9+
<package>gnu-hpc-ofi-testsuite</package>
10+
</multibuild>

‎macros.hpc-mpich‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#
2+
# mpich
3+
#
4+
5+
%hpc_mpich_init(V:) \
6+
%{-V: %define _mf_ver %{-V*}} \
7+
%{expand: %%global hpc_mpich_dep_version %%{?_mf_ver}} \
8+
%{expand: %%global hpc_mpich_dir mpich%{hpc_mpich_dep_version}} \
9+
%global hpc_mpich_pack_version %{hpc_mpich_dep_version} \
10+
%{expand: %%global _hpc_mpich_modules mpich}
11+
12+
# We may have to add a version here.
13+
%hpc_setup_mpich \
14+
module load mpich
15+
16+
%hpc_mpich_requires \
17+
Requires: mpich%{hpc_mpich_dep_version}-%{hpc_compiler_family}%{hpc_cf_pack_version}-hpc
18+
19+
%hpc_mpich_requires_devel \
20+
Requires: mpich%{hpc_mpich_dep_version}-%{hpc_compiler_family}%{hpc_cf_pack_version}-hpc-devel

mpich.spec renamed to mpich-EL_7.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: A high-performance implementation of MPI
22
Name: mpich
33
Version: 3.3
4-
Release: 3%{?dist}
4+
Release: 4%{?dist}
55
License: MIT
66
URL: http://www.mpich.org/
77

@@ -334,11 +334,14 @@ make check VERBOSE=1
334334
%{python3_sitearch}/%{name}.pth
335335

336336
%changelog
337+
* Tue Dec 10 2019 Brian J. Murrell <brian.murrell@intel.com> - 3.3-4
338+
- Another Update packaging standards
339+
337340
* Fri Nov 22 2019 Brian J. Murrell <brian.murrell@intel.com> - 3.3-3
338341
- Rebuild with newer CaRT SO version
339342

340343
* Sat Nov 02 2019 Brian J. Murrell <brian.murrell@intel.com> - 3.3-2
341-
- Another Update packaging standards
344+
- Another update packaging standards
342345

343346
* Fri Aug 30 2019 Brian J. Murrell <brian.murrell@intel.com> - 3.3-1
344347
- Update packaging standards

0 commit comments

Comments
 (0)