Commit af97b1eb authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

[master] reorder linking of libutil

This fixes problem seen when trying to build on FreeBSD
when the package is already installed (making it hard to upgrade).
I tested this on CentOS system too.
I don't like just re-ordering this but this is a quick hack for the problem.
(Another workaround would be to bump the shared library version
but that doesn't work due to the library has a name conflict with
library in base system. These two points will be resolved later.)
parent 83afc62e
...@@ -47,5 +47,5 @@ if USE_CLANGPP ...@@ -47,5 +47,5 @@ if USE_CLANGPP
liblog_la_CXXFLAGS += -Wno-error liblog_la_CXXFLAGS += -Wno-error
endif endif
liblog_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES) liblog_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
liblog_la_LIBADD = $(LOG4CPLUS_LIBS) $(top_builddir)/src/lib/util/libutil.la liblog_la_LIBADD = $(top_builddir)/src/lib/util/libutil.la $(LOG4CPLUS_LIBS)
liblog_la_LDFLAGS = -no-undefined -version-info 1:0:0 liblog_la_LDFLAGS = -no-undefined -version-info 1:0:0
...@@ -61,9 +61,9 @@ endif ...@@ -61,9 +61,9 @@ endif
AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES) AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
AM_LDFLAGS += $(GTEST_LDFLAGS) AM_LDFLAGS += $(GTEST_LDFLAGS)
AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
AM_LDADD += $(top_builddir)/src/lib/log/liblog.la AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
AM_LDADD += $(GTEST_LDADD) AM_LDADD += $(GTEST_LDADD)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment