ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

ofz#41602 fix more build failure

Browse Source 
since...

commit 8b9f8f0f9d
Date:   Sun May 30 13:23:16 2021 +0200

    libxml2: use xml2-config dummy for internal build

added -lm for all DISABLE_DYNLOADING targets which results in link time
failure of:

[LNK] Executable/cgmfuzzer
/usr/bin/ld.gold: warning: Cannot export local symbol '__asan_extra_spill_area'
/usr/lib/x86_64-linux-gnu/libm-2.31.a(s_atan.o):function __atan_ifunc: error: undefined reference to '_dl_x86_cpu_features'
/usr/lib/x86_64-linux-gnu/libm-2.31.a(s_ceil.o):function __ceil_ifunc: error: undefined reference to '_dl_x86_cpu_features'
/usr/lib/x86_64-linux-gnu/libm-2.31.a(s_floor.o):function __floor_ifunc: error: undefined reference to '_dl_x86_cpu_features'
/usr/lib/x86_64-linux-gnu/libm-2.31.a(s_sin.o):function __sin_ifunc: error: undefined reference to '_dl_x86_cpu_features'

like https://bugzilla.redhat.com/show_bug.cgi?id=1433347

because we end up with -lm inside the -Wl$(COMMA)-Bdynamic group of
solenv/gbuild/platform/unxgcc.mk

Change-Id: I080bbe462c9fcf0129ca3d4c3c764aa42eee9774
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126331
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2021-12-03 18:03:42 +01:00
parent a08089b8ea
commit ff25d6a123
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+19 -19
View File
@@ -9055,6 +9055,24 @@ else
AC_MSG_RESULT([no])
fi
dnl ==================================================================
dnl libfuzzer
dnl ==================================================================
AC_MSG_CHECKING([whether to enable fuzzers])
if test "$enable_fuzzers" != yes; then
AC_MSG_RESULT([no])
else
if test -z $LIB_FUZZING_ENGINE; then
AC_MSG_ERROR(['LIB_FUZZING_ENGINE' must be set when using --enable-fuzzers. Examples include '-fsanitize=fuzzer'.])
fi
AC_MSG_RESULT([yes])
ENABLE_FUZZERS="TRUE"
AC_DEFINE([ENABLE_FUZZERS],1)
BUILD_TYPE="$BUILD_TYPE FUZZERS"
fi
AC_SUBST(LIB_FUZZING_ENGINE)
AC_SUBST(ENABLE_FUZZERS)
dnl ===================================================================
dnl Check for system zlib
dnl ===================================================================
@@ -9563,7 +9581,7 @@ else
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
else
LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
if test "$DISABLE_DYNLOADING" = TRUE; then
if test "$DISABLE_DYNLOADING" = TRUE -a "$ENABLE_FUZZERS" != "TRUE"; then
LIBXML_LIBS="$LIBXML_LIBS -lm"
fi
fi
@@ -10684,24 +10702,6 @@ fi
AC_SUBST(ENABLE_BREAKPAD)
AC_SUBST(DEFAULT_CRASHDUMP_VALUE)
dnl ==================================================================
dnl libfuzzer
dnl ==================================================================
AC_MSG_CHECKING([whether to enable fuzzers])
if test "$enable_fuzzers" != yes; then
AC_MSG_RESULT([no])
else
if test -z $LIB_FUZZING_ENGINE; then
AC_MSG_ERROR(['LIB_FUZZING_ENGINE' must be set when using --enable-fuzzers. Examples include '-fsanitize=fuzzer'.])
fi
AC_MSG_RESULT([yes])
ENABLE_FUZZERS="TRUE"
AC_DEFINE([ENABLE_FUZZERS],1)
BUILD_TYPE="$BUILD_TYPE FUZZERS"
fi
AC_SUBST(LIB_FUZZING_ENGINE)
AC_SUBST(ENABLE_FUZZERS)
dnl ===================================================================
dnl Orcus
dnl ===================================================================