2
0
Эх сурвалжийг харах

Fix some compile and linking issues on NetBSD.

- adapt configure to link against -lrt to fix aio linking errors
- adapt configure to link against -lossaudio to fix oss linking errors

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5776 c046a42c-6fe2-441c-8c8c-71466251a162
blueswir1 16 жил өмнө
parent
commit
8ef92a880f
1 өөрчлөгдсөн 6 нэмэгдсэн , 1 устгасан
  1. 6 1
      configure

+ 6 - 1
configure

@@ -148,6 +148,7 @@ FreeBSD)
 bsd="yes"
 bsd="yes"
 audio_drv_list="oss"
 audio_drv_list="oss"
 audio_possible_drivers="oss sdl esd pa"
 audio_possible_drivers="oss sdl esd pa"
+aiolib="-lpthread"
 if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
 if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     kqemu="yes"
     kqemu="yes"
 fi
 fi
@@ -156,6 +157,8 @@ NetBSD)
 bsd="yes"
 bsd="yes"
 audio_drv_list="oss"
 audio_drv_list="oss"
 audio_possible_drivers="oss sdl esd"
 audio_possible_drivers="oss sdl esd"
+oss_lib="-lossaudio"
+aio_lib="-lrt -lpthread"
 ;;
 ;;
 OpenBSD)
 OpenBSD)
 bsd="yes"
 bsd="yes"
@@ -163,6 +166,7 @@ openbsd="yes"
 audio_drv_list="oss"
 audio_drv_list="oss"
 audio_possible_drivers="oss sdl esd"
 audio_possible_drivers="oss sdl esd"
 oss_lib="-lossaudio"
 oss_lib="-lossaudio"
+aio_lib="-lpthread"
 ;;
 ;;
 Darwin)
 Darwin)
 bsd="yes"
 bsd="yes"
@@ -173,6 +177,7 @@ audio_drv_list="coreaudio"
 audio_possible_drivers="coreaudio sdl fmod"
 audio_possible_drivers="coreaudio sdl fmod"
 OS_CFLAGS="-mdynamic-no-pic"
 OS_CFLAGS="-mdynamic-no-pic"
 OS_LDFLAGS="-framework CoreFoundation -framework IOKit"
 OS_LDFLAGS="-framework CoreFoundation -framework IOKit"
+aio_lib="-lpthread"
 ;;
 ;;
 SunOS)
 SunOS)
     solaris="yes"
     solaris="yes"
@@ -522,7 +527,7 @@ fi
 if [ "$darwin" = "yes" -o "$mingw32" = "yes" ] ; then
 if [ "$darwin" = "yes" -o "$mingw32" = "yes" ] ; then
     AIOLIBS=
     AIOLIBS=
 elif [ "$bsd" = "yes" ]; then
 elif [ "$bsd" = "yes" ]; then
-    AIOLIBS="-lpthread"
+    AIOLIBS="$aio_lib"
 else
 else
     # Some Linux architectures (e.g. s390) don't imply -lpthread automatically.
     # Some Linux architectures (e.g. s390) don't imply -lpthread automatically.
     AIOLIBS="-lrt -lpthread"
     AIOLIBS="-lrt -lpthread"