Merge pull request #8035 from yosefe/topic/port-build-fixes

Port Ubuntu22.04 and archlinux build fixes to v1.12.x
openucx · Mar 14, 2022 · 7465226 · 7465226
2 parents 54fd13d + d0c09e6
commit 7465226
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/src/ucs/configure.m4 b/src/ucs/configure.m4
@@ -54,11 +54,16 @@ AS_IF([test "x$with_bfd" != xno],
        save_LIBS="$LIBS"
 
        # Check BFD properties with all flags pointing to the custom location
-       CFLAGS="$CFLAGS $BFD_CHECK_CFLAGS"
        CPPFLAGS="$CPPFLAGS $BFD_CHECK_CPPFLAGS"
-       LDFLAGS="$LDFLAGS $BFD_CHECK_LDFLAGS"
        LIBS="$LIBS $BFD_CHECK_LIBS"
 
+       # Link the test applications as a shared library, to fail if libbfd is
+       # not a PIC object.
+       # Do not allow undefined symbols, to ensure all references are resolved.
+       # TODO Allow static link with static libbfd
+       CFLAGS="$CFLAGS $BFD_CHECK_CFLAGS -fPIC"
+       LDFLAGS="$LDFLAGS $BFD_CHECK_LDFLAGS -shared -Wl,--no-undefined"
+
        bfd_happy="yes"
        AC_CHECK_LIB(bfd, bfd_openr, [],
                     [