[v9,5/15] build: provide an option to link examples dynamically

Message ID 1514948409-30862-6-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Misc fixes
Related show

Commit Message

Github ODP bot Jan. 3, 2018, 2:59 a.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Distributions won't like statically-linked binaries. Provide configure
switch to link examples and tests dynamically.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 377 (lumag:misc-fixes)
 ** https://github.com/Linaro/odp/pull/377
 ** Patch: https://github.com/Linaro/odp/pull/377.patch
 ** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea
 ** Merge commit sha: 3bb30027436d5acc0d387f475d127a6f7ed86496
 **/
 configure.ac         | 11 +++++++++++
 example/Makefile.inc |  4 ++++
 test/Makefile.inc    |  4 ++++
 3 files changed, 19 insertions(+)

Patch

diff --git a/configure.ac b/configure.ac
index 177881a58..3242c453c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,16 @@  AS_IF([test "${with_platform}" = "linux-generic"],
 AC_DEFINE_UNQUOTED([IMPLEMENTATION_NAME], ["$IMPLEMENTATION_NAME"],
 		   [Define to the name of the implementation])
 
+##########################################################################
+# Build examples/tests dynamically
+##########################################################################
+AC_ARG_ENABLE([static-tests],
+	      [AS_HELP_STRING([--disable-static-tests],
+			      [disable static linking of examples and tests]
+			      [ with ODP])], [],
+	      [enable_static_tests=yes])
+AM_CONDITIONAL([STATIC_LINK], [test "x$enable_static_tests" != "xno"])
+
 ##########################################################################
 # Include m4 files
 ##########################################################################
@@ -383,6 +393,7 @@  AC_MSG_RESULT([
 	Deprecated APIs:	${deprecated}
 	debug:			${enable_debug}
 	cunit:			${cunit_support}
+	static tests linkage:	${enable_static_tests}
 	test_vald:		${test_vald}
 	test_perf:		${test_perf}
 	test_perf_proc:		${test_perf_proc}
diff --git a/example/Makefile.inc b/example/Makefile.inc
index 1609066e6..4cf5cfacc 100644
--- a/example/Makefile.inc
+++ b/example/Makefile.inc
@@ -13,4 +13,8 @@  AM_CFLAGS = \
 	-I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \
 	-I$(top_builddir)/include
 
+if STATIC_LINK
 AM_LDFLAGS = -L$(LIB) -static
+else
+AM_LDFLAGS =
+endif
diff --git a/test/Makefile.inc b/test/Makefile.inc
index f7c0da214..d7e435038 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -18,7 +18,11 @@  INCFLAGS = \
 AM_CPPFLAGS = $(INCFLAGS)
 AM_CFLAGS = $(CUNIT_CFLAGS)
 
+if STATIC_LINK
 AM_LDFLAGS = -L$(LIB) -static
+else
+AM_LDFLAGS =
+endif
 
 @VALGRIND_CHECK_RULES@