mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: make: fix clean rule by removing build file in qom/ configure: Link qga against UST tracing related libraries configure: Link QEMU against 'liburcu-bp' main-loop: make qemu_event_handle static block/curl: Replace usleep by g_usleep qtest: Add missing GCC_FMT_ATTR w32: Undefine error constants before their redefinition configure: fix mingw32 libs_qga typo
This commit is contained in:
commit
72fe3aaed9
6 changed files with 10 additions and 5 deletions
5
configure
vendored
5
configure
vendored
|
@ -526,7 +526,7 @@ EOF
|
|||
bindir="\${prefix}"
|
||||
sysconfdir="\${prefix}"
|
||||
confsuffix=""
|
||||
libs_qga="-lws2_32 -lwinmm -lpowrprof $lib_qga"
|
||||
libs_qga="-lws2_32 -lwinmm -lpowrprof $libs_qga"
|
||||
fi
|
||||
|
||||
werror=""
|
||||
|
@ -2680,7 +2680,8 @@ if test "$trace_backend" = "ust"; then
|
|||
int main(void) { return 0; }
|
||||
EOF
|
||||
if compile_prog "" "" ; then
|
||||
LIBS="-lust $LIBS"
|
||||
LIBS="-lust -lurcu-bp $LIBS"
|
||||
libs_qga="-lust -lurcu-bp $libs_qga"
|
||||
else
|
||||
echo
|
||||
echo "Error: Trace backend 'ust' missing libust header files"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue