Add -lm for static compile + minor test changes for 7.3
This commit is contained in:
parent
0ad59d3300
commit
1580aa7a2c
9 changed files with 10 additions and 8 deletions
|
|
@ -81,7 +81,7 @@ endif
|
||||||
# even though it may exist in $(libdir). But the new version may not have been installed yet.
|
# even though it may exist in $(libdir). But the new version may not have been installed yet.
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@
|
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@ -lm
|
||||||
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
||||||
|
|
||||||
# Name of application
|
# Name of application
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ endif # LINKAGE
|
||||||
# even though it may exist in $(libdir). But the new version may not have been installed yet.
|
# even though it may exist in $(libdir). But the new version may not have been installed yet.
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@
|
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@ -lm
|
||||||
|
|
||||||
INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ endif
|
||||||
# For dependency
|
# For dependency
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@
|
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@ -lm
|
||||||
|
|
||||||
ifeq ($(LINKAGE),dynamic)
|
ifeq ($(LINKAGE),dynamic)
|
||||||
CPPFLAGS = @CPPFLAGS@ -fPIC
|
CPPFLAGS = @CPPFLAGS@ -fPIC
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ endif
|
||||||
# For dependency
|
# For dependency
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@
|
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@ -lm
|
||||||
|
|
||||||
YACC = @YACC@
|
YACC = @YACC@
|
||||||
LEX = @LEX@
|
LEX = @LEX@
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ endif
|
||||||
# For dependency
|
# For dependency
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@
|
LIBS = -L$(top_srcdir)/lib/src $(top_srcdir)/lib/src/$(CLIXON_LIB) @LIBS@ -lm
|
||||||
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -384,7 +384,7 @@ clicon_hash_dump(clicon_hash_t *hash,
|
||||||
char **keys = NULL;
|
char **keys = NULL;
|
||||||
void *val;
|
void *val;
|
||||||
size_t klen;
|
size_t klen;
|
||||||
size_t vlen;
|
size_t vlen = 0;
|
||||||
|
|
||||||
if (hash == NULL)
|
if (hash == NULL)
|
||||||
goto ok;
|
goto ok;
|
||||||
|
|
|
||||||
|
|
@ -579,7 +579,6 @@ clixon_msg_rcv11(int s,
|
||||||
if (intr){
|
if (intr){
|
||||||
if (clixon_signal_save(&oldsigset, oldsigaction) < 0)
|
if (clixon_signal_save(&oldsigset, oldsigaction) < 0)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
set_signal(SIGINT, SIG_IGN, NULL);
|
set_signal(SIGINT, SIG_IGN, NULL);
|
||||||
clicon_signal_unblock(SIGINT);
|
clicon_signal_unblock(SIGINT);
|
||||||
set_signal_flags(SIGINT, 0, atomicio_sig_handler, NULL);
|
set_signal_flags(SIGINT, 0, atomicio_sig_handler, NULL);
|
||||||
|
|
|
||||||
|
|
@ -553,6 +553,9 @@ function start_backend(){
|
||||||
}
|
}
|
||||||
|
|
||||||
function stop_backend(){
|
function stop_backend(){
|
||||||
|
if [ $valgrindtest -eq 2 ]; then
|
||||||
|
sleep 1
|
||||||
|
fi
|
||||||
sudo clixon_backend -z $*
|
sudo clixon_backend -z $*
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
err "kill backend"
|
err "kill backend"
|
||||||
|
|
|
||||||
|
|
@ -315,7 +315,7 @@ EOF
|
||||||
new "b payload only"
|
new "b payload only"
|
||||||
testall '<dummy xmlns="urn:example:b"/>' '<dummy xmlns="urn:example:b"/>'
|
testall '<dummy xmlns="urn:example:b"/>' '<dummy xmlns="urn:example:b"/>'
|
||||||
|
|
||||||
new "b payload and interfaces payload---------"
|
new "b payload and interfaces payload"
|
||||||
testall '<dummy xmlns="urn:example:b"/><dummy xmlns="urn:example:interfaces"/>' '<dummy xmlns="urn:example:b"/>'
|
testall '<dummy xmlns="urn:example:b"/><dummy xmlns="urn:example:interfaces"/>' '<dummy xmlns="urn:example:b"/>'
|
||||||
|
|
||||||
new "a payload only"
|
new "a payload only"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue