Skip to content

Commit 767da04

Browse files
committed
mpiext/shortfloat: do not build an empty library
the shortfloat extension is only made of header files, and hence do not require a library to be built. Refs. open-mpi#6205 Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 01fbf3e commit 767da04

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed

ompi/mpiext/shortfloat/c/Makefile.am

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
#
22
# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
3+
# Copyright (c) 2019 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
35
# $COPYRIGHT$
46
#
57
# Additional copyrights may follow
68
#
79
# $HEADER$
810
#
911

10-
# Convenience libtool library that will be slurped up into libmpi.la.
11-
noinst_LTLIBRARIES = libmpiext_shortfloat_c.la
12-
1312
# This is where the top-level header file (that is included in
1413
# <mpi-ext.h>) must be installed.
1514
ompidir = $(ompiincludedir)/mpiext
1615

1716
# This is the header file that is installed.
1817
ompi_HEADERS = mpiext_shortfloat_c.h
19-
20-
# Sources for the convenience libtool library.
21-
libmpiext_shortfloat_c_la_SOURCES = $(ompi_HEADERS)
22-
libmpiext_shortfloat_c_la_LDFLAGS = -module -avoid-version

ompi/mpiext/shortfloat/configure.m4

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# -*- shell-script -*-
22
#
33
# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
4+
# Copyright (c) 2019 Research Organization for Information Science
5+
# and Technology (RIST). All rights reserved.
46
# $COPYRIGHT$
57
#
68
# Additional copyrights may follow
@@ -26,7 +28,8 @@ AC_DEFUN([OMPI_MPIEXT_shortfloat_CONFIG],[
2628
test "$ENABLE_EXT_ALL" = "1"; } && \
2729
{ test "$ac_cv_type_short_float" = "yes" || \
2830
test "$ac_cv_type_opal_short_float_t" = "yes"; }],
29-
[$1],
31+
[NOLIB_shortfloat=1
32+
$1],
3033
[$2])
3134

3235
AS_IF([test "$opal_short_float_type" = "_Float16"],

ompi/mpiext/shortfloat/mpif-h/Makefile.am

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,10 @@
77
# $HEADER$
88
#
99

10-
# Convenience libtool library that will be slurped up into libmpi_mpifh.la.
11-
noinst_LTLIBRARIES =
12-
1310
# Directory where the header file to be included in mpif-ext.h must be
1411
# installed.
1512
ompidir = $(ompiincludedir)/mpiext
1613

17-
# If we are, build the convenience libtool library that will be
18-
# slurped up into libmpi_mpifh.la.
19-
noinst_LTLIBRARIES += libmpiext_shortfloat_mpifh.la
20-
2114
# Just like noinst_LTLIBRARIES, set this macro to empty and
2215
# conditionally add to it later.
2316
ompi_HEADERS =
@@ -29,8 +22,4 @@ if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
2922
# This is the header file that is installed.
3023
ompi_HEADERS += mpiext_shortfloat_mpifh.h
3124

32-
# Sources for the convenience libtool library.
33-
libmpiext_shortfloat_mpifh_la_SOURCES = $(ompi_HEADERS)
34-
libmpiext_shortfloat_mpifh_la_LDFLAGS = -module -avoid-version
35-
3625
endif
Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#
22
# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
3+
# Copyright (c) 2019 Research Organization for Information Science
4+
# and Technology (RIST). All rights reserved.
35
# $COPYRIGHT$
46
#
57
# Additional copyrights may follow
@@ -10,33 +12,14 @@
1012
# This file builds the use_mpi_f08-based bindings for MPI extensions. It
1113
# is optional in MPI extensions.
1214

13-
# We must set these #defines and include paths so that the inner OMPI
14-
# MPI prototype header files do the Right Thing.
15-
AM_FCFLAGS = $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \
16-
-I$(top_srcdir) $(FCFLAGS_f90)
17-
18-
# Note that the mpi_f08-based bindings are optional -- they can only
19-
# be built if OMPI is also building the Fortran-based bindings. So we
20-
# initially set some Makefile macros to empty, and then conditionally
21-
# add to them later.
22-
noinst_LTLIBRARIES =
23-
2415
# Use the Automake conditional to know if we're building the "use mpi_f08"
2516
# bindings.
2617
if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
2718

28-
# If we are, build the convenience libtool library that will be
29-
# slurped up into libmpi_usempif08.la.
30-
noinst_LTLIBRARIES += libmpiext_shortfloat_usempif08.la
31-
3219
# Note that no header files are installed; instead,
3320
# mpiext_shortfloat_usempif08.h is automatically slurped up into the
3421
# mpi_f08_ext module. It must be listed so that it is included in
3522
# dist tarballs.
3623
noinst_HEADERS = mpiext_shortfloat_usempif08.h
3724

38-
# Sources for the convenience libtool library.
39-
libmpiext_shortfloat_usempif08_la_SOURCES = $(ompi_HEADERS)
40-
libmpiext_shortfloat_usempif08_la_LDFLAGS = -module -avoid-version
41-
4225
endif

0 commit comments

Comments
 (0)