From df1f5458006939e84b22f230b04a6b9300d25b8a Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 08:14:45 -0700 Subject: [PATCH 1/9] doc: README.md should mention lua 5.1 as build req --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 02e22a25e999..e6f2bc1c8ab2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ zeromq4-devel >= 4.0.4 # built --with-libsodium czmq-devel >= 2.2.0 munge-devel json-c-devel +lua-5.1-devel ``` Spec files for building zeromq4 and czmq packages on a RHEL 6 based system are provided for your convenience in foreign/rpm. From 0d10296bbc0ea96cef941861700a9c4a5d6255e8 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 08:21:41 -0700 Subject: [PATCH 2/9] build: wreck needs $(LUA_INCLUDE) on ubuntu On ubuntu, liblua5.1-0-dev packages lua.h in /usr/include/lua5.1 --- src/modules/wreck/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/wreck/Makefile.am b/src/modules/wreck/Makefile.am index 71028207bc48..8782dd10292c 100644 --- a/src/modules/wreck/Makefile.am +++ b/src/modules/wreck/Makefile.am @@ -1,6 +1,7 @@ AM_CFLAGS = @GCCWARN@ AM_CPPFLAGS = \ + $(LUA_INCLUDE) \ $(JSON_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/include \ From 193825aae419e59be433d26d801db70b71df052d Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 08:29:24 -0700 Subject: [PATCH 3/9] build: wrexecd needs $(LIBPTHREAD) on ubuntu We get undefined pthread_mutex_trylock() at link time on ubuntu when linking wrexecd without -lpthread --- src/modules/wreck/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wreck/Makefile.am b/src/modules/wreck/Makefile.am index 8782dd10292c..8502af03ad20 100644 --- a/src/modules/wreck/Makefile.am +++ b/src/modules/wreck/Makefile.am @@ -77,7 +77,7 @@ wrexecd_LDADD = \ $(top_builddir)/src/modules/kvs/libkvs.la \ $(top_builddir)/src/common/liblsd/liblsd.la \ $(top_builddir)/src/common/libutil/libutil.la \ - $(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LUA_LIB) + $(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LUA_LIB) $(LIBPTHREAD) dist_wreckscripts_SCRIPTS = \ lua.d/01-env.lua From 4865c9164077a67fae8b9fae5d574f9faa133b26 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 08:31:21 -0700 Subject: [PATCH 4/9] flux-start: include for ubuntu --- src/cmd/flux-start.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cmd/flux-start.c b/src/cmd/flux-start.c index 43236a72140f..778871a9fe3d 100644 --- a/src/cmd/flux-start.c +++ b/src/cmd/flux-start.c @@ -27,6 +27,8 @@ #endif #include #include +#include +#include #include #include "src/common/libutil/xzmalloc.h" From 9c536c264ad5fb734dc021ee65a8731a10ca4fae Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 08:35:30 -0700 Subject: [PATCH 5/9] doc: README.md should mention asciidoc --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e6f2bc1c8ab2..3121a8293b26 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ czmq-devel >= 2.2.0 munge-devel json-c-devel lua-5.1-devel +asciidoc ``` Spec files for building zeromq4 and czmq packages on a RHEL 6 based system are provided for your convenience in foreign/rpm. From 11abc0f1d6b577e2df28faa96d033fe22b43affa Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 09:28:12 -0700 Subject: [PATCH 6/9] test: get spellcheck working with newer automake Putting a command in TEST_ENVIRONMENT and expecting it to iterate over a list of arguments in TEST is fragile. In newer automakes, other things are appended to TEST_ENVIRONMENT and this breaks. Modify the man page spell checker so that it is one test called 'spellcheck' that checks all the *.[1-9] files it can glob. --- doc/cmd/Makefile.am | 10 +++++++--- doc/cmd/spellcheck | 25 ++++++++++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/doc/cmd/Makefile.am b/doc/cmd/Makefile.am index fc15cb945d14..27300b40d3d8 100644 --- a/doc/cmd/Makefile.am +++ b/doc/cmd/Makefile.am @@ -25,10 +25,14 @@ SUFFIXES = .adoc .1 --attribute manmanual="Flux Manual" \ --doctype manpage --format manpage $< -EXTRA_DIST = $(ADOC_FILES) COPYRIGHT.adoc spellcheck spell.en.pws +EXTRA_DIST = $(ADOC_FILES) COPYRIGHT.adoc spell.en.pws CLEANFILES = $(MAN1_FILES) $(XML_FILES) -TESTS_ENVIRONMENT = $(srcdir)/spellcheck $(abs_srcdir)/spell.en.pws +noinst_SCRIPTS = spellcheck -TESTS = $(MAN1_FILES) +TESTS_ENVIRONMENT = \ + pws_dict=$(abs_srcdir)/spell.en.pws \ + man_dir=$(abs_builddir) + +TESTS = spellcheck diff --git a/doc/cmd/spellcheck b/doc/cmd/spellcheck index c318474c0b6c..225b878bb70d 100755 --- a/doc/cmd/spellcheck +++ b/doc/cmd/spellcheck @@ -1,19 +1,26 @@ #!/bin/bash -if test $# != 2; then - echo Usage: spellcheck pws-dict file >&2 +if test $man_dir; then + set ${man_dir}/*.[1-9] +fi + +if test $# == 0; then + echo "Usage: spellcheck file [file...]" >&2 exit 1 fi -declare dict=$1 -declare file=$2 +dict=${pws_dict:-./spell.en.pws} if ! test -r $dict; then echo Dictionary $dict not found >&2 exit 1 fi -tmpfile=$(mktemp) -rc=$(cat $file | aspell -p $dict -n list | sort | uniq | tee $tmpfile | wc -l) -cat $tmpfile -rm -f $tmpfile -exit $rc +exit_val=0 +for f in $*; do + tmpfile=$(mktemp) + rc=$(cat $f | aspell -p $dict -n list | sort | uniq | tee $tmpfile | wc -l) + test $rc == 0 || exit_val=$rc + cat $tmpfile | sed -e "s!^!$(basename $f): !" + rm -f $tmpfile +done +exit $exit_val From 992f8c0026d6c957ce18f5fadc4f88c5a050e19d Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 09:56:13 -0700 Subject: [PATCH 7/9] test: add some words to dict for ubuntu Apparently these words were in our dictionary for rhel6 but not on ubuntu. --- doc/cmd/spell.en.pws | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/cmd/spell.en.pws b/doc/cmd/spell.en.pws index b26f60ff6ca4..090c1c95edbc 100644 --- a/doc/cmd/spell.en.pws +++ b/doc/cmd/spell.en.pws @@ -107,3 +107,8 @@ noexec pre slurm srun +cryptographic +unlink +timestamped +libs +scalable From 4b82d8b8bf12217334bcbdd860d956db442a4d39 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 09:30:59 -0700 Subject: [PATCH 8/9] build: link libcore against $(LIBDL) for ubuntu --- src/lib/libcore/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/libcore/Makefile.am b/src/lib/libcore/Makefile.am index 970cb612be7c..f789311f041f 100644 --- a/src/lib/libcore/Makefile.am +++ b/src/lib/libcore/Makefile.am @@ -15,7 +15,8 @@ libflux_core_la_LIBADD = \ $(top_builddir)/src/common/libflux/libflux.la \ $(top_builddir)/src/common/libutil/libutil.la \ $(top_builddir)/src/common/liblsd/liblsd.la \ - $(LIBMUNGE) $(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LIBPTHREAD) $(LIBUTIL) + $(LIBMUNGE) $(JSON_LIBS) $(LIBZMQ) $(LIBCZMQ) $(LIBPTHREAD) $(LIBUTIL) \ + $(LIBDL) libflux_core_la_LDFLAGS = -Wl,--version-script=$(srcdir)/version.map From 3b3b7f108f7ffad3a4403adcaa4b9fb65918399d Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Sat, 27 Sep 2014 09:55:09 -0700 Subject: [PATCH 9/9] build: add LIBUTIL to lua binding for ubuntu Without this forkpty() comes up undefined --- src/bindings/lua/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bindings/lua/Makefile.am b/src/bindings/lua/Makefile.am index e069d97584ac..413bc78553cc 100644 --- a/src/bindings/lua/Makefile.am +++ b/src/bindings/lua/Makefile.am @@ -38,7 +38,8 @@ flux_la_LIBADD = \ $(top_builddir)/src/common/liblsd/liblsd.la \ $(JSON_LIBS) \ $(LIBZMQ) \ - $(LIBCZMQ) + $(LIBCZMQ) \ + $(LIBUTIL) flux_la_SOURCES = \ flux-lua.c \