]> git.puffer.fish Git - mirror/frr.git/commitdiff
docker/compile_frr: Don't build with disable shared
authorChristian Franke <chris@opensourcerouting.org>
Fri, 9 Nov 2018 14:42:10 +0000 (15:42 +0100)
committerChristian Franke <chris@opensourcerouting.org>
Thu, 29 Nov 2018 15:51:27 +0000 (16:51 +0100)
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>
tests/topotests/docker/inner/compile_frr.sh

index 896514b5d5cdb91b0013211d05b0fa92badaee80..2d72082c1ecd44a0d4b47052baa2815cb815ab7c 100755 (executable)
@@ -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 \