From 709d7a0a86629d68e9477fec5fd5a273e1741141 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 4 Nov 2016 11:13:44 +0900 Subject: [PATCH 1/3] event/libevent2022: add missing dependencies to the embedded libevent lib force the libevent2022 component rebuild if the embedded libevent is updated Signed-off-by: Gilles Gouaillardet (cherry picked from commit open-mpi/ompi@6f7ed1f552ba12944fc8975a6c3bce0ad7e23215) --- opal/mca/event/libevent2022/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/opal/mca/event/libevent2022/Makefile.am b/opal/mca/event/libevent2022/Makefile.am index becfb78d9fe..c5117ef2bb1 100644 --- a/opal/mca/event/libevent2022/Makefile.am +++ b/opal/mca/event/libevent2022/Makefile.am @@ -4,6 +4,8 @@ # Copyright (c) 2012-2013 Los Alamos National Security, LLC. # All rights reserved. # Copyright (c) 2015 Intel, Inc. All rights reserved +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -80,10 +82,13 @@ component_noinst = libmca_event_libevent2022.la component_install = endif + # We only ever build this component statically noinst_LTLIBRARIES = $(component_noinst) libmca_event_libevent2022_la_SOURCES =$(sources) libmca_event_libevent2022_la_LDFLAGS = -module -avoid-version libmca_event_libevent2022_la_LIBADD = $(builddir)/libevent/libevent.la +libmca_event_libevent2022_la_DEPENDENCIES = $(builddir)/libevent/libevent.la +mca_event_libevent2022_la_DEPENDENCIES = $(builddir)/libevent/libevent.la From af454263d4ec43fa76ebd01687279986e0fc21a6 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 7 Nov 2016 14:57:52 +0900 Subject: [PATCH 2/3] event/libevent2022: cleanup dependencies to the embedded libevent lib configury force event/libevent2022 to be built as a static module, so simplify Makefile.am Signed-off-by: Gilles Gouaillardet (cherry picked from commit open-mpi/ompi@7a2894f1e0a4dbbeb33a8335f54e823eb72ee6c3) --- opal/mca/event/libevent2022/Makefile.am | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/opal/mca/event/libevent2022/Makefile.am b/opal/mca/event/libevent2022/Makefile.am index c5117ef2bb1..5fff134f99d 100644 --- a/opal/mca/event/libevent2022/Makefile.am +++ b/opal/mca/event/libevent2022/Makefile.am @@ -70,17 +70,11 @@ nobase_opal_HEADERS = $(headers) nobase_nodist_opal_HEADERS = libevent/include/event2/event-config.h endif -# Make the output library in this directory, and name it either -# mca__.la (for DSO builds) or libmca__.la -# (for static builds). +# Make the output library in this directory, and name it +# libmca__.la because build is forced to be static-only -if MCA_BUILD_opal_event_libevent2022_DSO -component_noinst = -component_install = mca_event_libevent2022.la -else component_noinst = libmca_event_libevent2022.la component_install = -endif # We only ever build this component statically @@ -90,5 +84,4 @@ libmca_event_libevent2022_la_SOURCES =$(sources) libmca_event_libevent2022_la_LDFLAGS = -module -avoid-version libmca_event_libevent2022_la_LIBADD = $(builddir)/libevent/libevent.la libmca_event_libevent2022_la_DEPENDENCIES = $(builddir)/libevent/libevent.la -mca_event_libevent2022_la_DEPENDENCIES = $(builddir)/libevent/libevent.la From a66da81894c7b06e1cf8f81a64f5f5df00939c11 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 7 Nov 2016 15:07:24 +0900 Subject: [PATCH 3/3] pmix/pmix112: add missing dependencies to the embedded pmix library master already does that for pmix3x, so this is a one-off commit for the v2.x branch Signed-off-by: Gilles Gouaillardet --- opal/mca/pmix/pmix112/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opal/mca/pmix/pmix112/Makefile.am b/opal/mca/pmix/pmix112/Makefile.am index 7c669d400c9..84ed3f35ed6 100644 --- a/opal/mca/pmix/pmix112/Makefile.am +++ b/opal/mca/pmix/pmix112/Makefile.am @@ -1,7 +1,7 @@ # # Copyright (c) 2014-2015 Intel, Inc. All rights reserved. # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2015 Research Organization for Information Science +# Copyright (c) 2015-2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ # @@ -42,6 +42,7 @@ mca_pmix_pmix112_la_CPPFLAGS = \ -I$(srcdir)/pmix/include $(opal_pmix_pmix112_CPPFLAGS) mca_pmix_pmix112_la_LDFLAGS = -module -avoid-version $(opal_pmix_pmix112_LDFLAGS) mca_pmix_pmix112_la_LIBADD = $(opal_pmix_pmix112_LIBS) +mca_pmix_pmix112_la_DEPENDENCIES = $(opal_pmix_pmix112_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_pmix_pmix112_la_SOURCES =$(sources) @@ -49,3 +50,4 @@ libmca_pmix_pmix112_la_CFLAGS = $(opal_pmix_pmix112_CFLAGS) libmca_pmix_pmix112_la_CPPFLAGS = -I$(srcdir)/pmix/include $(opal_pmix_pmix112_CPPFLAGS) libmca_pmix_pmix112_la_LDFLAGS = -module -avoid-version $(opal_pmix_pmix112_LDFLAGS) libmca_pmix_pmix112_la_LIBADD = $(opal_pmix_pmix112_LIBS) +libmca_pmix_pmix112_la_DEPENDENCIES = $(opal_pmix_pmix112_LIBS)