From 8f3ed2e36d1297b38998cfaa82e16dfefc40187c Mon Sep 17 00:00:00 2001 From: Danny Auble <da@schedmd.com> Date: Wed, 16 Mar 2016 13:33:42 -0700 Subject: [PATCH] Fix linking issues to only have the compression libs link to file_bcast which intern get pulled in my anyone linking to the .la. --- src/bcast/Makefile.am | 6 +++--- src/bcast/Makefile.in | 9 +++++---- src/sbcast/Makefile.am | 6 +++--- src/sbcast/Makefile.in | 7 +++---- src/slurmd/slurmd/Makefile.am | 9 ++++----- src/slurmd/slurmd/Makefile.in | 11 +++++------ src/srun/Makefile.am | 7 +++---- src/srun/Makefile.in | 12 ++++-------- 8 files changed, 30 insertions(+), 37 deletions(-) diff --git a/src/bcast/Makefile.am b/src/bcast/Makefile.am index d3ead6eef5c..f1df367fe72 100644 --- a/src/bcast/Makefile.am +++ b/src/bcast/Makefile.am @@ -6,8 +6,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common BCAST_LIB = libfile_bcast.la libfile_bcast_la_SOURCES = file_bcast.c file_bcast.h -libfile_bcast_la_LIBADD = $(ZLIB_LIBS) -libfile_bcast_la_LDFLAGS = $(LIB_LDFLAGS) $(ZLIB_LDFLAGS) -libfile_bcast_la_CFLAGS = $(ZLIB_CPPFLAGS) $(AM_CFLAGS) +libfile_bcast_la_LIBADD = $(ZLIB_LIBS) $(LZ4_LIBS) +libfile_bcast_la_LDFLAGS = $(LIB_LDFLAGS) $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) +libfile_bcast_la_CFLAGS = $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) $(AM_CFLAGS) noinst_LTLIBRARIES = $(BCAST_LIB) diff --git a/src/bcast/Makefile.in b/src/bcast/Makefile.in index 8c4337f9278..4775af55cd7 100644 --- a/src/bcast/Makefile.in +++ b/src/bcast/Makefile.in @@ -146,7 +146,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = -libfile_bcast_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libfile_bcast_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libfile_bcast_la_OBJECTS = libfile_bcast_la-file_bcast.lo libfile_bcast_la_OBJECTS = $(am_libfile_bcast_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -478,9 +479,9 @@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common BCAST_LIB = libfile_bcast.la libfile_bcast_la_SOURCES = file_bcast.c file_bcast.h -libfile_bcast_la_LIBADD = $(ZLIB_LIBS) -libfile_bcast_la_LDFLAGS = $(LIB_LDFLAGS) $(ZLIB_LDFLAGS) -libfile_bcast_la_CFLAGS = $(ZLIB_CPPFLAGS) $(AM_CFLAGS) +libfile_bcast_la_LIBADD = $(ZLIB_LIBS) $(LZ4_LIBS) +libfile_bcast_la_LDFLAGS = $(LIB_LDFLAGS) $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) +libfile_bcast_la_CFLAGS = $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) $(AM_CFLAGS) noinst_LTLIBRARIES = $(BCAST_LIB) all: all-am diff --git a/src/sbcast/Makefile.am b/src/sbcast/Makefile.am index 8470b789f88..9fa48ffe549 100644 --- a/src/sbcast/Makefile.am +++ b/src/sbcast/Makefile.am @@ -3,12 +3,12 @@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) bin_PROGRAMS = sbcast sbcast_LDADD = $(top_builddir)/src/api/libslurm.o \ $(top_builddir)/src/bcast/libfile_bcast.la \ - $(DL_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS) -lm + $(DL_LIBS) -lm noinst_HEADERS = sbcast.h sbcast_SOURCES = sbcast.c opts.c @@ -17,5 +17,5 @@ force: $(sbcast_LDADD) : force @cd `dirname $@` && $(MAKE) `basename $@` -sbcast_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) +sbcast_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in index a6d36eb8d99..641187badd3 100644 --- a/src/sbcast/Makefile.in +++ b/src/sbcast/Makefile.in @@ -155,7 +155,6 @@ sbcast_OBJECTS = $(am_sbcast_OBJECTS) am__DEPENDENCIES_1 = sbcast_DEPENDENCIES = $(top_builddir)/src/api/libslurm.o \ $(top_builddir)/src/bcast/libfile_bcast.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -483,14 +482,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign -AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) $(BG_INCLUDES) sbcast_LDADD = $(top_builddir)/src/api/libslurm.o \ $(top_builddir)/src/bcast/libfile_bcast.la \ - $(DL_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS) -lm + $(DL_LIBS) -lm noinst_HEADERS = sbcast.h sbcast_SOURCES = sbcast.c opts.c -sbcast_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) +sbcast_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) all: all-am .SUFFIXES: diff --git a/src/slurmd/slurmd/Makefile.am b/src/slurmd/slurmd/Makefile.am index 8ae92e26d31..0e73c0b0363 100644 --- a/src/slurmd/slurmd/Makefile.am +++ b/src/slurmd/slurmd/Makefile.am @@ -6,18 +6,17 @@ AUTOMAKE_OPTIONS = foreign sbin_PROGRAMS = slurmd AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ - -I$(top_srcdir) $(HWLOC_CPPFLAGS) $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) + -I$(top_srcdir) $(HWLOC_CPPFLAGS) slurmd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ $(top_builddir)/src/bcast/libfile_bcast.la \ ../common/libslurmd_common.o $(HWLOC_LIBS) \ $(top_builddir)/src/api/libslurm.o $(DL_LIBS) \ - ../common/libslurmd_reverse_tree_math.la \ - $(ZLIB_LIBS) $(LZ4_LIBS) + ../common/libslurmd_reverse_tree_math.la + +slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(HWLOC_LDFLAGS) -slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(HWLOC_LDFLAGS) \ - $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) if HAVE_AIX # We need to set maxdata back to 0 because this effects the "max memory size" # ulimit, and the ulimit is inherited by child processes. diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in index c33e75522fe..8783aa279b0 100644 --- a/src/slurmd/slurmd/Makefile.in +++ b/src/slurmd/slurmd/Makefile.in @@ -93,6 +93,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ sbin_PROGRAMS = slurmd$(EXEEXT) + # We need to set maxdata back to 0 because this effects the "max memory size" # ulimit, and the ulimit is inherited by child processes. @HAVE_AIX_TRUE@am__append_1 = -Wl,-bmaxdata:0x0 @@ -160,8 +161,7 @@ slurmd_DEPENDENCIES = $(top_builddir)/src/common/libdaemonize.la \ $(top_builddir)/src/bcast/libfile_bcast.la \ ../common/libslurmd_common.o $(am__DEPENDENCIES_1) \ $(top_builddir)/src/api/libslurm.o $(am__DEPENDENCIES_1) \ - ../common/libslurmd_reverse_tree_math.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + ../common/libslurmd_reverse_tree_math.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -488,18 +488,17 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\" \ - -I$(top_srcdir) $(HWLOC_CPPFLAGS) $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) + -I$(top_srcdir) $(HWLOC_CPPFLAGS) slurmd_LDADD = \ $(top_builddir)/src/common/libdaemonize.la \ $(top_builddir)/src/bcast/libfile_bcast.la \ ../common/libslurmd_common.o $(HWLOC_LIBS) \ $(top_builddir)/src/api/libslurm.o $(DL_LIBS) \ - ../common/libslurmd_reverse_tree_math.la \ - $(ZLIB_LIBS) $(LZ4_LIBS) + ../common/libslurmd_reverse_tree_math.la slurmd_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(HWLOC_LDFLAGS) \ - $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) $(am__append_1) + $(am__append_1) SLURMD_SOURCES = \ slurmd.c slurmd.h \ req.c req.h \ diff --git a/src/srun/Makefile.am b/src/srun/Makefile.am index 19be1ecb293..6d25221a48d 100644 --- a/src/srun/Makefile.am +++ b/src/srun/Makefile.am @@ -5,8 +5,7 @@ SUBDIRS = libsrun AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun \ - $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun bin_PROGRAMS = srun @@ -19,9 +18,9 @@ srun_SOURCES = \ srun.c \ srun_pty.c srun_pty.h \ srun.wrapper.c -srun_LDADD = $(convenience_libs) $(DL_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS) +srun_LDADD = $(convenience_libs) $(DL_LIBS) -srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(ZLIB_LDFLAGS) $(LZ4_LDFLAGS) +srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) if BGQ_LOADED # because totalview needs the libraries on load we link in srun diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in index 522f3566d17..a6da5baf87f 100644 --- a/src/srun/Makefile.in +++ b/src/srun/Makefile.in @@ -155,8 +155,7 @@ am_srun_OBJECTS = srun.$(OBJEXT) srun_pty.$(OBJEXT) \ srun.wrapper.$(OBJEXT) srun_OBJECTS = $(am_srun_OBJECTS) am__DEPENDENCIES_1 = -srun_DEPENDENCIES = $(convenience_libs) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +srun_DEPENDENCIES = $(convenience_libs) $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -526,9 +525,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = libsrun AUTOMAKE_OPTIONS = foreign CLEANFILES = core.* -AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun \ - $(ZLIB_CPPFLAGS) $(LZ4_CPPFLAGS) - +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/srun/libsrun convenience_libs = $(top_builddir)/src/srun/libsrun/libsrun.la \ $(top_builddir)/src/bcast/libfile_bcast.la \ $(top_builddir)/src/api/libslurm.o @@ -538,9 +535,8 @@ srun_SOURCES = \ srun_pty.c srun_pty.h \ srun.wrapper.c -srun_LDADD = $(convenience_libs) $(DL_LIBS) $(ZLIB_LIBS) $(LZ4_LIBS) -srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(ZLIB_LDFLAGS) \ - $(LZ4_LDFLAGS) $(am__append_1) +srun_LDADD = $(convenience_libs) $(DL_LIBS) +srun_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(am__append_1) all: all-recursive .SUFFIXES: -- GitLab