From 96451c9c6237d039a4adfc043664b78f9d036f9a Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 11 Apr 2011 19:35:19 +0000
Subject: [PATCH] Fix a couple of problems with exported symbols that prevented
tests 20.2, 20.4 and 7.3 from running with select/bluegene
---
src/api/Makefile.am | 1 +
src/api/Makefile.in | 1 +
src/common/node_select.c | 2 ++
src/common/slurm_xlator.h | 5 +++++
src/plugins/select/bluegene/bg_read_config.c | 1 +
5 files changed, 10 insertions(+)
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 7799cb4815d..8ca69cff41d 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -162,6 +162,7 @@ $(VERSION_SCRIPT) :
(echo "{ global:"; \
echo " islurm_*;"; \
echo " slurm_*;"; \
+ echo " slurmdb_*;"; \
echo " local: *;"; \
echo "};") > $(VERSION_SCRIPT)
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index b3c6b3973d5..3a33114ccc1 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -874,6 +874,7 @@ $(VERSION_SCRIPT) :
(echo "{ global:"; \
echo " islurm_*;"; \
echo " slurm_*;"; \
+ echo " slurmdb_*;"; \
echo " local: *;"; \
echo "};") > $(VERSION_SCRIPT)
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 22e7c54cd6f..3fc60bcf721 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -58,6 +58,8 @@
#include "src/slurmctld/slurmctld.h"
#include "src/common/node_select.h"
+strong_alias(destroy_select_ba_request, slurm_destroy_select_ba_request);
+
static int select_context_cnt = -1;
static int select_context_default = -1;
/* If there is a new select plugin, list it here */
diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h
index a43b3b9467f..c7a65ab9d72 100644
--- a/src/common/slurm_xlator.h
+++ b/src/common/slurm_xlator.h
@@ -342,6 +342,9 @@
#define jobacct_common_alloc_jobacct slurm_jobacct_common_alloc_jobacct
#define jobacct_common_free_jobacct slurm_jobacct_common_free_jobacct
+/* node_select.[ch] functions */
+#define destroy_select_ba_request slurm_destroy_select_ba_request
+
#endif /* USE_ALIAS */
/* Include the function definitions after redefining their names. */
@@ -352,11 +355,13 @@
#include "src/common/list.h"
#include "src/common/log.h"
#include "src/common/macros.h"
+#include "src/common/node_select.h"
#include "src/common/pack.h"
#include "src/common/env.h"
#include "src/common/slurm_auth.h"
#include "src/common/strlcpy.h"
#include "src/common/switch.h"
+#include "src/common/working_cluster.h"
#include "src/common/xassert.h"
#include "src/common/xmalloc.h"
#include "src/common/xsignal.h"
diff --git a/src/plugins/select/bluegene/bg_read_config.c b/src/plugins/select/bluegene/bg_read_config.c
index 4036cd45eaa..6d9776ebc2a 100644
--- a/src/plugins/select/bluegene/bg_read_config.c
+++ b/src/plugins/select/bluegene/bg_read_config.c
@@ -36,6 +36,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
+#include "src/common/slurm_xlator.h" /* Must be first */
#include "bg_core.h"
#include "bg_read_config.h"
#include "src/common/node_select.h"
--
GitLab