From: Christian Franke <chris@opensourcerouting.org>
Date: Fri, 9 Nov 2018 14:42:10 +0000 (+0100)
Subject: docker/compile_frr: Don't build with disable shared
X-Git-Tag: frr-7.1-dev~144^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=937e5dab6a352e22363b5bee7e504b92d964d45e;p=matthieu%2Ffrr.git

docker/compile_frr: Don't build with disable shared

With libyang, we need to build the frr_user_types.so libyang
plugin for FRR to work.

This means we cannot build with disable shared.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---

diff --git a/tests/topotests/docker/inner/compile_frr.sh b/tests/topotests/docker/inner/compile_frr.sh
index 896514b5d5..2d72082c1e 100755
--- a/tests/topotests/docker/inner/compile_frr.sh
+++ b/tests/topotests/docker/inner/compile_frr.sh
@@ -74,9 +74,7 @@ if [ ! -e Makefile ]; then
 	if [ "${TOPOTEST_SANITIZER}" != "0" ]; then
 		export CC="gcc"
 		export CFLAGS="-O1 -g -fsanitize=address -fno-omit-frame-pointer"
-		export LD="gcc"
 		export LDFLAGS="-g -fsanitize=address -ldl"
-		EXTRA_CONFIGURE+=" --enable-shared=no "
 		touch .address_sanitizer
 	else
 		rm -f .address_sanitizer
@@ -84,6 +82,8 @@ if [ ! -e Makefile ]; then
 
 	bash configure >&3 \
 		--enable-static-bin \
+		--enable-static \
+		--enable-shared \
 		--with-moduledir=/usr/lib/frr/modules \
 		--prefix=/usr \
 		--localstatedir=/var/run/frr \