Merge pull request #481 from cisco/feature/UTchanges

Some fixes for android/octeon
cisco · Aug 25, 2020 · d8e2689 · d8e2689
2 parents b7dc2d6 + 6204463
commit d8e2689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/configure b/configure
@@ -10962,11 +10962,12 @@ pre_libs="$LIBS"
 # script modifies LDFLAGS to correctly search for libs. we unset these changes so
 # makefile.am have complete control over linker flags
 pre_ldflags="$LDFLAGS"
-if test "$is_freebsd" != "1" ; then
+if test "$is_freebsd" != "1" && test "x$enable_offline" = "xfalse" ; then
     LIBS="-ldl $LIBS"
 fi
 if test "x$enable_offline" != "xfalse" ; then
-    LDFLAGS="-static $LDFLAGS"
+    #Some platforms have multiple definitions. Allow them for JUST the library test stage.
+    LDFLAGS="-static -Wl,--allow-multiple-definition $LDFLAGS"
 fi
 # Search for SSL and Crypto libs, and if it doesn't fail set the make vars accordingly
 if test "x$disable_app" = "xno" ; then

diff --git a/configure.ac b/configure.ac
@@ -171,11 +171,12 @@ pre_libs="$LIBS"
 # script modifies LDFLAGS to correctly search for libs. we unset these changes so
 # makefile.am have complete control over linker flags
 pre_ldflags="$LDFLAGS"
-if test "$is_freebsd" != "1" ; then
+if test "$is_freebsd" != "1" && test "x$enable_offline" = "xfalse" ; then
     LIBS="-ldl $LIBS"
 fi
 if test "x$enable_offline" != "xfalse" ; then
-    LDFLAGS="-static $LDFLAGS"
+    #Some platforms have multiple definitions. Allow them for JUST the library test stage.
+    LDFLAGS="-static -Wl,--allow-multiple-definition $LDFLAGS"
 fi
 # Search for SSL and Crypto libs, and if it doesn't fail set the make vars accordingly
 if test "x$disable_app" = "xno" ; then