* [Qemu-devel] [PATCH] fix the static compilation for sdl
@ 2010-02-08 5:56 TeLeMan
2010-02-08 8:30 ` [Qemu-devel] " Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: TeLeMan @ 2010-02-08 5:56 UTC (permalink / raw)
To: qemu-devel
The static compilation for sdl is broken after
79427693174a553d62f3da44aacd3f19ba8df3a7.
Signed-off-by: TeLeMan <geleman@gmail.com>
---
configure | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 4c95c27..213dddf 100644
--- a/configure
+++ b/configure
@@ -1063,7 +1063,11 @@ if test "$sdl" != "no" ; then
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
EOF
sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
- sdl_libs=`$sdlconfig --libs 2> /dev/null`
+ if test "$static" = "yes" ; then
+ sdl_libs=`sdl-config --static-libs 2>/dev/null`
+ else
+ sdl_libs=`$sdlconfig --libs 2> /dev/null`
+ fi
if compile_prog "$sdl_cflags" "$sdl_libs" ; then
if test "$_sdlversion" -lt 121 ; then
sdl_too_old=yes
@@ -1075,7 +1079,6 @@ EOF
# static link with sdl ? (note: sdl.pc's --static --libs is broken)
if test "$sdl" = "yes" -a "$static" = "yes" ; then
- sdl_libs=`sdl-config --static-libs 2>/dev/null`
if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`"
--
1.6.5.1.1367.gcd48
--
SUN OF A BEACH
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] Re: [PATCH] fix the static compilation for sdl
2010-02-08 5:56 [Qemu-devel] [PATCH] fix the static compilation for sdl TeLeMan
@ 2010-02-08 8:30 ` Paolo Bonzini
2010-02-08 8:51 ` [Qemu-devel] " Loïc Minier
2010-02-08 11:30 ` Aurelien Jarno
2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2010-02-08 8:30 UTC (permalink / raw)
To: TeLeMan; +Cc: qemu-devel
On 02/08/2010 06:56 AM, TeLeMan wrote:
> The static compilation for sdl is broken after
> 79427693174a553d62f3da44aacd3f19ba8df3a7.
ACK.
> Signed-off-by: TeLeMan<geleman@gmail.com>
> ---
> configure | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 4c95c27..213dddf 100644
> --- a/configure
> +++ b/configure
> @@ -1063,7 +1063,11 @@ if test "$sdl" != "no" ; then
> int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
> EOF
> sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
> - sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + if test "$static" = "yes" ; then
> + sdl_libs=`sdl-config --static-libs 2>/dev/null`
> + else
> + sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + fi
> if compile_prog "$sdl_cflags" "$sdl_libs" ; then
> if test "$_sdlversion" -lt 121 ; then
> sdl_too_old=yes
> @@ -1075,7 +1079,6 @@ EOF
>
> # static link with sdl ? (note: sdl.pc's --static --libs is broken)
> if test "$sdl" = "yes" -a "$static" = "yes" ; then
> - sdl_libs=`sdl-config --static-libs 2>/dev/null`
> if test $? = 0&& echo $sdl_libs | grep -- -laa> /dev/null; then
> sdl_libs="$sdl_libs `aalib-config --static-libs>2 /dev/null`"
> sdl_cflags="$sdl_cflags `aalib-config --cflags>2 /dev/null`"
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] fix the static compilation for sdl
2010-02-08 5:56 [Qemu-devel] [PATCH] fix the static compilation for sdl TeLeMan
2010-02-08 8:30 ` [Qemu-devel] " Paolo Bonzini
@ 2010-02-08 8:51 ` Loïc Minier
2010-02-08 11:30 ` Aurelien Jarno
2 siblings, 0 replies; 4+ messages in thread
From: Loïc Minier @ 2010-02-08 8:51 UTC (permalink / raw)
To: qemu-devel
On Mon, Feb 08, 2010, TeLeMan wrote:
> The static compilation for sdl is broken after
> 79427693174a553d62f3da44aacd3f19ba8df3a7.
>
> Signed-off-by: TeLeMan <geleman@gmail.com>
> ---
> configure | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 4c95c27..213dddf 100644
> --- a/configure
> +++ b/configure
> @@ -1063,7 +1063,11 @@ if test "$sdl" != "no" ; then
> int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
> EOF
> sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
> - sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + if test "$static" = "yes" ; then
> + sdl_libs=`sdl-config --static-libs 2>/dev/null`
> + else
> + sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + fi
> if compile_prog "$sdl_cflags" "$sdl_libs" ; then
> if test "$_sdlversion" -lt 121 ; then
> sdl_too_old=yes
> @@ -1075,7 +1079,6 @@ EOF
>
> # static link with sdl ? (note: sdl.pc's --static --libs is broken)
> if test "$sdl" = "yes" -a "$static" = "yes" ; then
> - sdl_libs=`sdl-config --static-libs 2>/dev/null`
> if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
> sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
> sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`"
Signed-off-by: Loïc Minier <lool@dooz.org>
Ah right, the tests were being run on a shared libsdl no matter actual
linking would happen against the static or shared libsdl; thanks for
fixing the ordering.
--
Loïc Minier
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] fix the static compilation for sdl
2010-02-08 5:56 [Qemu-devel] [PATCH] fix the static compilation for sdl TeLeMan
2010-02-08 8:30 ` [Qemu-devel] " Paolo Bonzini
2010-02-08 8:51 ` [Qemu-devel] " Loïc Minier
@ 2010-02-08 11:30 ` Aurelien Jarno
2 siblings, 0 replies; 4+ messages in thread
From: Aurelien Jarno @ 2010-02-08 11:30 UTC (permalink / raw)
To: TeLeMan; +Cc: qemu-devel
On Mon, Feb 08, 2010 at 01:56:44PM +0800, TeLeMan wrote:
> The static compilation for sdl is broken after
> 79427693174a553d62f3da44aacd3f19ba8df3a7.
>
> Signed-off-by: TeLeMan <geleman@gmail.com>
Thanks, applied.
> ---
> configure | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 4c95c27..213dddf 100644
> --- a/configure
> +++ b/configure
> @@ -1063,7 +1063,11 @@ if test "$sdl" != "no" ; then
> int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
> EOF
> sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
> - sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + if test "$static" = "yes" ; then
> + sdl_libs=`sdl-config --static-libs 2>/dev/null`
> + else
> + sdl_libs=`$sdlconfig --libs 2> /dev/null`
> + fi
> if compile_prog "$sdl_cflags" "$sdl_libs" ; then
> if test "$_sdlversion" -lt 121 ; then
> sdl_too_old=yes
> @@ -1075,7 +1079,6 @@ EOF
>
> # static link with sdl ? (note: sdl.pc's --static --libs is broken)
> if test "$sdl" = "yes" -a "$static" = "yes" ; then
> - sdl_libs=`sdl-config --static-libs 2>/dev/null`
> if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
> sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
> sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`"
> --
> 1.6.5.1.1367.gcd48
>
> --
> SUN OF A BEACH
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-08 11:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-08 5:56 [Qemu-devel] [PATCH] fix the static compilation for sdl TeLeMan
2010-02-08 8:30 ` [Qemu-devel] " Paolo Bonzini
2010-02-08 8:51 ` [Qemu-devel] " Loïc Minier
2010-02-08 11:30 ` Aurelien Jarno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).