Skip to content

Fix misc issues evidenced whey building on msys2 arch #6002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix misc issues evidenced whey building on msys2 arch #6002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc5acc4
mpool/base: add missing #include
ggouaillardet Oct 31, 2018
c8ec6ad
configury: rename a pushed variable in OPAL_CONFIG_SUBDIR
ggouaillardet Oct 30, 2018
4406c2c
configury: add missing dependencies
ggouaillardet Oct 30, 2018
aaae58f
use #ifdef with AC_CHECK_HEADERS() generated macros
ggouaillardet Oct 31, 2018
688aec3
misc stuff
ggouaillardet Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config/opal_config_subdir.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2015-2018 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
Expand All @@ -22,7 +22,7 @@ dnl $HEADER$
dnl

AC_DEFUN([OPAL_CONFIG_SUBDIR],[
OPAL_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp])
OPAL_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part subdir_temp])

#
# Invoke configure in a specific subdirectory.
Expand Down Expand Up @@ -58,8 +58,8 @@ if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
[[\\/]]* | ?:[[\\/]]* ) total_dir=;;
*) total_dir=.;;
esac
temp=$subdir_dir
for dir_part in `IFS='/\\'; set X $temp; shift; echo "$[@]"`; do
subdir_temp=$subdir_dir
for dir_part in `IFS='/\\'; set X $subdir_temp; shift; echo "$[@]"`; do
case $dir_part in
# Skip DOS drivespec
?:) total_dir=$dir_part ;;
Expand Down
18 changes: 7 additions & 11 deletions ompi/mca/common/monitoring/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# of Tennessee Research Foundation. All rights
# reserved.
# Copyright (c) 2016 Inria. All rights reserved.
# Copyright (c) 2017 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2017-2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# Copyright (c) 2018 Cisco Systems, Inc. All rights reserved
# $COPYRIGHT$
#
Expand All @@ -13,11 +13,15 @@
# $HEADER$
#

include $(top_srcdir)/Makefile.ompi-rules
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit message on this commit no longer matches what the commit actually does.

I don't know / care if you want to split this into multiple commits:

  • Add the dependencies
  • Fix the comments
  • Use Makefile.ompi-rules


EXTRA_DIST = profile2mat.pl aggregate_profile.pl

sources = common_monitoring.c common_monitoring_coll.c
headers = common_monitoring.h common_monitoring_coll.h

# See the comments in opal/mca/common/sm/Makefile.am for the explanations

lib_LTLIBRARIES =
noinst_LTLIBRARIES =
component_install = libmca_common_monitoring.la
Expand Down Expand Up @@ -50,15 +54,7 @@ libmca_common_monitoring_la_LDFLAGS = \
libmca_common_monitoring_la_LIBADD = $(common_monitoring_LIBS)
libmca_common_monitoring_noinst_la_SOURCES = $(headers) $(sources)

# These two rules will sym link the "noinst" libtool library filename
# to the installable libtool library filename in the case where we are
# compiling this component statically (case 2), described above).
V=0
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(component_install)`;

all-local:
all-local: $(component_noinst)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're now including Makefile.ompi-rules, I think you need to also change OMPI_V_LN_SCOMP to OMPI_V_LN_S everywhere.

$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
rm -f "$(component_install)"; \
$(LN_S) "$(component_noinst)" "$(component_install)"; \
Expand Down
23 changes: 5 additions & 18 deletions ompi/mca/common/ompio/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Copyright (c) 2008-2018 University of Houston. All rights reserved.
# Copyright (c) 2016 IBM Corporation. All rights reserved.
# Copyright (c) 2017-2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# and Technology (RIST). All rights reserved.
#
# $COPYRIGHT$
#
Expand All @@ -21,6 +21,8 @@
# $HEADER$
#

include $(top_srcdir)/Makefile.ompi-rules

headers = \
common_ompio_aggregators.h \
common_ompio_print_queue.h \
Expand All @@ -37,14 +39,7 @@ sources = \
common_ompio_file_write.c


# To simplify components that link to this library, we will *always*
# have an output libtool library named libmca_<type>_<name>.la -- even
# for case 2) described above (i.e., so there's no conditional logic
# necessary in component Makefile.am's that link to this library).
# Hence, if we're creating a noinst version of this library (i.e.,
# case 2), we sym link it to the libmca_<type>_<name>.la name
# (libtool will do the Right Things under the covers). See the
# all-local and clean-local rules, below, for how this is effected.
# See the comments in opal/mca/common/sm/Makefile.am for the explanations

lib_LTLIBRARIES =
noinst_LTLIBRARIES =
Expand Down Expand Up @@ -79,15 +74,7 @@ headers += common_ompio_cuda.h
sources += common_ompio_cuda.c
endif

# These two rules will sym link the "noinst" libtool library filename
# to the installable libtool library filename in the case where we are
# compiling this component statically (case 2), described above).
V=0
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;

all-local:
all-local: $(comp_noinst)
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
rm -f "$(comp_inst)"; \
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/fbtl/posix/fbtl_posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <unistd.h>
#include <sys/uio.h>
#if HAVE_AIO_H
#ifdef HAVE_AIO_H
#include <aio.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <unistd.h>
#include <sys/uio.h>
#if HAVE_AIO_H
#ifdef HAVE_AIO_H
#include <aio.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include <unistd.h>
#include <sys/uio.h>
#if HAVE_AIO_H
#ifdef HAVE_AIO_H
#include <aio.h>
#endif

Expand Down
4 changes: 2 additions & 2 deletions ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@

#include "ompi_config.h"

#if HAVE_LIBGEN_H
#ifdef HAVE_LIBGEN_H
#include <libgen.h>
#endif
#if HAVE_SYS_STAT_H
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif

Expand Down
12 changes: 5 additions & 7 deletions opal/mca/common/sm/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2010-2015 Los Alamos National Security, LLC.
# All rights reserved.
# Copyright (c) 2018 Research Organization for Information Science
# and Technology (RIST). All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -41,6 +43,8 @@
# Note that building this common component statically and linking
# against other dynamic components is *not* supported!

include $(top_srcdir)/Makefile.ompi-rules

# Header files

headers = \
Expand Down Expand Up @@ -101,13 +105,7 @@ endif
# to the installable libtool library filename in the case where we are
# compiling this component statically (case 2), described above).

# See Makefile.ompi-rules for an explanation of the "V" macros, below
V=0
OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
ompi__v_LN_SCOMP_0 = @echo " LN_S " `basename $(comp_inst)`;

all-local:
all-local: $(comp_noinst)
$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
rm -f "$(comp_inst)"; \
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
Expand Down
9 changes: 4 additions & 5 deletions opal/mca/compress/base/compress_base_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*
* Copyright (c) 2004-2010 The Trustees of Indiana University.
* All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
*
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* $COPYRIGHT$
*
Expand All @@ -16,10 +15,10 @@

#include <string.h>
#include <sys/wait.h>
#if HAVE_SYS_TYPES_H
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if HAVE_UNISTD_H
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_FCNTL_H
Expand Down
8 changes: 4 additions & 4 deletions opal/mca/compress/bzip/compress_bzip_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
*
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* $COPYRIGHT$
*
Expand All @@ -20,7 +20,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#if HAVE_UNISTD_H
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif /* HAVE_UNISTD_H */

Expand Down
8 changes: 4 additions & 4 deletions opal/mca/compress/gzip/compress_gzip_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* All rights reserved.
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
*
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* $COPYRIGHT$
*
Expand All @@ -20,7 +20,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#if HAVE_UNISTD_H
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif /* HAVE_UNISTD_H */

Expand Down
2 changes: 1 addition & 1 deletion opal/mca/event/libevent2022/libevent/event.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extern "C" {
/* For int types. */
#include <evutil.h>

#ifdef WIN32
#if defined(WIN32) && !defined(__CYGWIN__)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
Expand Down
4 changes: 2 additions & 2 deletions opal/mca/hwloc/base/hwloc_base_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Copyright (c) 2012-2017 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
* Copyright (c) 2015-2017 Research Organization for Information Science
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (C) 2018 Mellanox Technologies, Ltd.
* All rights reserved.
Expand Down Expand Up @@ -42,7 +42,7 @@
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#if HAVE_FCNTL_H
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif

Expand Down
8 changes: 6 additions & 2 deletions opal/mca/mpool/base/mpool_base_tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* Copyright (c) 2010 IBM Corporation. All rights reserved.
* Copyright (c) 2012-2015 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
* $COPYRIGHT$
*
Expand All @@ -27,6 +27,10 @@

#include "opal_config.h"

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

#include "opal/mca/mca.h"
#include "opal/util/show_help.h"
#include "opal/util/proc.h"
Expand Down
10 changes: 5 additions & 5 deletions opal/mca/pmix/pmix4x/pmix/config/pmix_config_subdir.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
dnl All rights reserved.
dnl Copyright (c) 2012-2016 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
dnl Copyright (c) 2015 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2015-2018 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
Expand All @@ -22,7 +22,7 @@ dnl $HEADER$
dnl

AC_DEFUN([PMIX_CONFIG_SUBDIR],[
PMIX_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp])
PMIX_VAR_SCOPE_PUSH([subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part subdir_temp])

#
# Invoke configure in a specific subdirectory.
Expand Down Expand Up @@ -58,8 +58,8 @@ if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then
[[\\/]]* | ?:[[\\/]]* ) total_dir=;;
*) total_dir=.;;
esac
temp=$subdir_dir
for dir_part in `IFS='/\\'; set X $temp; shift; echo "$[@]"`; do
subdir_temp=$subdir_dir
for dir_part in `IFS='/\\'; set X $subdir_temp; shift; echo "$[@]"`; do
case $dir_part in
# Skip DOS drivespec
?:) total_dir=$dir_part ;;
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/pmix/pmix4x/pmix/src/mca/common/dstore/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pmixdir = $(pmixincludedir)/$(subdir)
pmix_HEADERS = $(headers)
endif

all-local:
all-local: $(comp_noinst)
if test -z "$(lib_LTLIBRARIES)"; then \
rm -f "$(comp_inst)"; \
$(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
Expand Down
4 changes: 3 additions & 1 deletion opal/mca/rcache/grdma/rcache_grdma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* Copyright (c) 2006 Voltaire. All rights reserved.
* Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
*
* $COPYRIGHT$
*
Expand All @@ -30,7 +32,7 @@
#include "opal/class/opal_list.h"
#include "opal/mca/event/event.h"
#include "opal/mca/rcache/rcache.h"
#if HAVE_SYS_MMAN_H
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif

Expand Down
4 changes: 3 additions & 1 deletion opal/mca/rcache/udreg/rcache_udreg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* Copyright (c) 2006 Voltaire. All rights reserved.
* Copyright (c) 2011-2016 Los Alamos National Security, LLC. All rights
* reserved.
* Copyright (c) 2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
*
* $COPYRIGHT$
*
Expand All @@ -32,7 +34,7 @@
#include "opal/mca/event/event.h"
#include "opal/mca/rcache/rcache.h"
#include "opal/util/proc.h"
#if HAVE_SYS_MMAN_H
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif

Expand Down
Loading