* [Qemu-devel] [RFC][PATCH] configure: target dependent linking
@ 2011-04-14 21:14 Michael Walle
2011-04-25 20:04 ` Aurelien Jarno
0 siblings, 1 reply; 11+ messages in thread
From: Michael Walle @ 2011-04-14 21:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Walle, Alexander Graf
This patch is the first attempt to make configure more intelligent with
regard to how it links to libraries. It divides the softmmu libraries into
two lists, a general one and a list which depends on the target
architecture.
---
configure | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index da2da04..9825b12 100755
--- a/configure
+++ b/configure
@@ -1946,11 +1946,11 @@ int main(void) { return 0; }
EOF
if compile_prog "" "$fdt_libs" ; then
fdt=yes
- libs_softmmu="$fdt_libs $libs_softmmu"
else
if test "$fdt" = "yes" ; then
feature_not_found "fdt"
fi
+ fdt_libs=
fdt=no
fi
fi
@@ -1967,11 +1967,11 @@ int main(void) { GL_VERSION; return 0; }
EOF
if compile_prog "" "-lGL" ; then
opengl=yes
- libs_softmmu="$opengl_libs $libs_softmmu"
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl"
fi
+ opengl_libs=
opengl=no
fi
fi
@@ -3071,6 +3071,7 @@ target_short_alignment=2
target_int_alignment=4
target_long_alignment=4
target_llong_alignment=8
+target_libs_softmmu=
TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH=""
@@ -3104,6 +3105,7 @@ case "$target_arch2" in
;;
lm32)
target_phys_bits=32
+ target_libs_softmmu="$opengl_libs"
;;
m68k)
bflt="yes"
@@ -3142,6 +3144,7 @@ case "$target_arch2" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=32
target_nptl="yes"
+ target_libs_softmmu="$fdt_libs"
;;
ppcemb)
TARGET_BASE_ARCH=ppc
@@ -3149,6 +3152,7 @@ case "$target_arch2" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
target_nptl="yes"
+ target_libs_softmmu="$fdt_libs"
;;
ppc64)
TARGET_BASE_ARCH=ppc
@@ -3156,6 +3160,7 @@ case "$target_arch2" in
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
target_long_alignment=8
+ target_libs_softmmu="$fdt_libs"
;;
ppc64abi32)
TARGET_ARCH=ppc64
@@ -3164,6 +3169,7 @@ case "$target_arch2" in
echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
+ target_libs_softmmu="$fdt_libs"
;;
sh4|sh4eb)
TARGET_ARCH=sh4
@@ -3249,7 +3255,7 @@ fi
if test "$target_softmmu" = "yes" ; then
echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "LIBS+=$libs_softmmu" >> $config_target_mak
+ echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
fi
--
1.7.2.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [RFC][PATCH] configure: target dependent linking
2011-04-14 21:14 [Qemu-devel] [RFC][PATCH] configure: target dependent linking Michael Walle
@ 2011-04-25 20:04 ` Aurelien Jarno
2011-04-25 21:44 ` Michael Walle
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Aurelien Jarno @ 2011-04-25 20:04 UTC (permalink / raw)
To: Michael Walle; +Cc: qemu-devel, Alexander Graf
On Thu, Apr 14, 2011 at 11:14:58PM +0200, Michael Walle wrote:
> This patch is the first attempt to make configure more intelligent with
> regard to how it links to libraries. It divides the softmmu libraries into
> two lists, a general one and a list which depends on the target
> architecture.
>
> ---
> configure | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
This looks fine to me.
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
> diff --git a/configure b/configure
> index da2da04..9825b12 100755
> --- a/configure
> +++ b/configure
> @@ -1946,11 +1946,11 @@ int main(void) { return 0; }
> EOF
> if compile_prog "" "$fdt_libs" ; then
> fdt=yes
> - libs_softmmu="$fdt_libs $libs_softmmu"
> else
> if test "$fdt" = "yes" ; then
> feature_not_found "fdt"
> fi
> + fdt_libs=
> fdt=no
> fi
> fi
> @@ -1967,11 +1967,11 @@ int main(void) { GL_VERSION; return 0; }
> EOF
> if compile_prog "" "-lGL" ; then
> opengl=yes
> - libs_softmmu="$opengl_libs $libs_softmmu"
> else
> if test "$opengl" = "yes" ; then
> feature_not_found "opengl"
> fi
> + opengl_libs=
> opengl=no
> fi
> fi
> @@ -3071,6 +3071,7 @@ target_short_alignment=2
> target_int_alignment=4
> target_long_alignment=4
> target_llong_alignment=8
> +target_libs_softmmu=
>
> TARGET_ARCH="$target_arch2"
> TARGET_BASE_ARCH=""
> @@ -3104,6 +3105,7 @@ case "$target_arch2" in
> ;;
> lm32)
> target_phys_bits=32
> + target_libs_softmmu="$opengl_libs"
> ;;
> m68k)
> bflt="yes"
> @@ -3142,6 +3144,7 @@ case "$target_arch2" in
> gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=32
> target_nptl="yes"
> + target_libs_softmmu="$fdt_libs"
> ;;
> ppcemb)
> TARGET_BASE_ARCH=ppc
> @@ -3149,6 +3152,7 @@ case "$target_arch2" in
> gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=64
> target_nptl="yes"
> + target_libs_softmmu="$fdt_libs"
> ;;
> ppc64)
> TARGET_BASE_ARCH=ppc
> @@ -3156,6 +3160,7 @@ case "$target_arch2" in
> gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=64
> target_long_alignment=8
> + target_libs_softmmu="$fdt_libs"
> ;;
> ppc64abi32)
> TARGET_ARCH=ppc64
> @@ -3164,6 +3169,7 @@ case "$target_arch2" in
> echo "TARGET_ABI32=y" >> $config_target_mak
> gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=64
> + target_libs_softmmu="$fdt_libs"
> ;;
> sh4|sh4eb)
> TARGET_ARCH=sh4
> @@ -3249,7 +3255,7 @@ fi
> if test "$target_softmmu" = "yes" ; then
> echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
> echo "CONFIG_SOFTMMU=y" >> $config_target_mak
> - echo "LIBS+=$libs_softmmu" >> $config_target_mak
> + echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
> echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
> echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
> fi
> --
> 1.7.2.3
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [RFC][PATCH] configure: target dependent linking
2011-04-25 20:04 ` Aurelien Jarno
@ 2011-04-25 21:44 ` Michael Walle
2011-04-25 21:49 ` Alexander Graf
2011-04-25 22:09 ` [Qemu-devel] [PATCH 1/2] configure: support " Michael Walle
2011-04-25 22:09 ` [Qemu-devel] [PATCH 2/2] configure: reenable opengl by default Michael Walle
2 siblings, 1 reply; 11+ messages in thread
From: Michael Walle @ 2011-04-25 21:44 UTC (permalink / raw)
To: Aurelien Jarno; +Cc: qemu-devel, Alexander Graf
Am Montag 25 April 2011, 22:04:58 schrieb Aurelien Jarno:
> On Thu, Apr 14, 2011 at 11:14:58PM +0200, Michael Walle wrote:
> > This patch is the first attempt to make configure more intelligent with
> > regard to how it links to libraries. It divides the softmmu libraries
> > into two lists, a general one and a list which depends on the target
> > architecture.
> >
> > ---
> >
> > configure | 12 +++++++++---
> > 1 files changed, 9 insertions(+), 3 deletions(-)
>
> This looks fine to me.
>
> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Ok, the next question is, what libs are target dependent. Or should we just
start with lm32 (opengl) and ppc?
@alex: could you comment on the libs, which are only used for ppc, only fdt?
--
Michael
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [RFC][PATCH] configure: target dependent linking
2011-04-25 21:44 ` Michael Walle
@ 2011-04-25 21:49 ` Alexander Graf
0 siblings, 0 replies; 11+ messages in thread
From: Alexander Graf @ 2011-04-25 21:49 UTC (permalink / raw)
To: Michael Walle; +Cc: qemu-devel, Aurelien Jarno
On 25.04.2011, at 23:44, Michael Walle wrote:
> Am Montag 25 April 2011, 22:04:58 schrieb Aurelien Jarno:
>> On Thu, Apr 14, 2011 at 11:14:58PM +0200, Michael Walle wrote:
>>> This patch is the first attempt to make configure more intelligent with
>>> regard to how it links to libraries. It divides the softmmu libraries
>>> into two lists, a general one and a list which depends on the target
>>> architecture.
>>>
>>> ---
>>>
>>> configure | 12 +++++++++---
>>> 1 files changed, 9 insertions(+), 3 deletions(-)
>>
>> This looks fine to me.
>>
>> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
>
> Ok, the next question is, what libs are target dependent. Or should we just
> start with lm32 (opengl) and ppc?
That's a really good start :).
> @alex: could you comment on the libs, which are only used for ppc, only fdt?
For now, let's leave it at that :). Can't think of any others OTOH, but maybe I'm missing something - which could easily be added later on then :).
Alex
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH 1/2] configure: support target dependent linking
2011-04-25 20:04 ` Aurelien Jarno
2011-04-25 21:44 ` Michael Walle
@ 2011-04-25 22:09 ` Michael Walle
2011-04-26 5:39 ` Edgar E. Iglesias
2011-04-25 22:09 ` [Qemu-devel] [PATCH 2/2] configure: reenable opengl by default Michael Walle
2 siblings, 1 reply; 11+ messages in thread
From: Michael Walle @ 2011-04-25 22:09 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Walle, Alexander Graf, Aurelien Jarno
This patch is the first attempt to make configure more intelligent with
regard to how it links to libraries. It divides the softmmu libraries into
two lists, a general one and a list which depends on the target
architecture.
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
---
configure | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index da2da04..9825b12 100755
--- a/configure
+++ b/configure
@@ -1946,11 +1946,11 @@ int main(void) { return 0; }
EOF
if compile_prog "" "$fdt_libs" ; then
fdt=yes
- libs_softmmu="$fdt_libs $libs_softmmu"
else
if test "$fdt" = "yes" ; then
feature_not_found "fdt"
fi
+ fdt_libs=
fdt=no
fi
fi
@@ -1967,11 +1967,11 @@ int main(void) { GL_VERSION; return 0; }
EOF
if compile_prog "" "-lGL" ; then
opengl=yes
- libs_softmmu="$opengl_libs $libs_softmmu"
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl"
fi
+ opengl_libs=
opengl=no
fi
fi
@@ -3071,6 +3071,7 @@ target_short_alignment=2
target_int_alignment=4
target_long_alignment=4
target_llong_alignment=8
+target_libs_softmmu=
TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH=""
@@ -3104,6 +3105,7 @@ case "$target_arch2" in
;;
lm32)
target_phys_bits=32
+ target_libs_softmmu="$opengl_libs"
;;
m68k)
bflt="yes"
@@ -3142,6 +3144,7 @@ case "$target_arch2" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=32
target_nptl="yes"
+ target_libs_softmmu="$fdt_libs"
;;
ppcemb)
TARGET_BASE_ARCH=ppc
@@ -3149,6 +3152,7 @@ case "$target_arch2" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
target_nptl="yes"
+ target_libs_softmmu="$fdt_libs"
;;
ppc64)
TARGET_BASE_ARCH=ppc
@@ -3156,6 +3160,7 @@ case "$target_arch2" in
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
target_long_alignment=8
+ target_libs_softmmu="$fdt_libs"
;;
ppc64abi32)
TARGET_ARCH=ppc64
@@ -3164,6 +3169,7 @@ case "$target_arch2" in
echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
+ target_libs_softmmu="$fdt_libs"
;;
sh4|sh4eb)
TARGET_ARCH=sh4
@@ -3249,7 +3255,7 @@ fi
if test "$target_softmmu" = "yes" ; then
echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "LIBS+=$libs_softmmu" >> $config_target_mak
+ echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
fi
--
1.7.2.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH 1/2] configure: support target dependent linking
2011-04-25 22:09 ` [Qemu-devel] [PATCH 1/2] configure: support " Michael Walle
@ 2011-04-26 5:39 ` Edgar E. Iglesias
2011-04-25 22:24 ` [Qemu-devel] [PATCH v2] " Michael Walle
2011-04-25 22:24 ` [Qemu-devel] [PATCH] " Michael Walle
0 siblings, 2 replies; 11+ messages in thread
From: Edgar E. Iglesias @ 2011-04-26 5:39 UTC (permalink / raw)
To: Michael Walle; +Cc: qemu-devel, Aurelien Jarno, Alexander Graf
On Tue, Apr 26, 2011 at 12:09:00AM +0200, Michael Walle wrote:
> This patch is the first attempt to make configure more intelligent with
> regard to how it links to libraries. It divides the softmmu libraries into
> two lists, a general one and a list which depends on the target
> architecture.
Hi,
I'm currently traveling and cannot test your patch, but please
note that the microblaze arch also uses the fdt lib. Looking
at it quickly it seems like it's missing for mb.
Cheers
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH v2] configure: support target dependent linking
2011-04-26 5:39 ` Edgar E. Iglesias
@ 2011-04-25 22:24 ` Michael Walle
2011-04-25 22:24 ` [Qemu-devel] [PATCH] " Michael Walle
1 sibling, 0 replies; 11+ messages in thread
From: Michael Walle @ 2011-04-25 22:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Edgar E. Iglesias, Alexander Graf, Aurelien Jarno
changes v2
- add libfdt for microblaze targets
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH] configure: support target dependent linking
2011-04-26 5:39 ` Edgar E. Iglesias
2011-04-25 22:24 ` [Qemu-devel] [PATCH v2] " Michael Walle
@ 2011-04-25 22:24 ` Michael Walle
2011-04-26 6:28 ` Edgar E. Iglesias
2011-04-26 21:32 ` Aurelien Jarno
1 sibling, 2 replies; 11+ messages in thread
From: Michael Walle @ 2011-04-25 22:24 UTC (permalink / raw)
To: qemu-devel
Cc: Edgar E. Iglesias, Michael Walle, Alexander Graf, Aurelien Jarno
This patch is the first attempt to make configure more intelligent with
regard to how it links to libraries. It divides the softmmu libraries into
two lists, a general one and a list which depends on the target
architecture.
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
---
configure | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index da2da04..ca675f6 100755
--- a/configure
+++ b/configure
@@ -1946,11 +1946,11 @@ int main(void) { return 0; }
EOF
if compile_prog "" "$fdt_libs" ; then
fdt=yes
- libs_softmmu="$fdt_libs $libs_softmmu"
else
if test "$fdt" = "yes" ; then
feature_not_found "fdt"
fi
+ fdt_libs=
fdt=no
fi
fi
@@ -1967,11 +1967,11 @@ int main(void) { GL_VERSION; return 0; }
EOF
if compile_prog "" "-lGL" ; then
opengl=yes
- libs_softmmu="$opengl_libs $libs_softmmu"
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl"
fi
+ opengl_libs=
opengl=no
fi
fi
@@ -3071,6 +3071,7 @@ target_short_alignment=2
target_int_alignment=4
target_long_alignment=4
target_llong_alignment=8
+target_libs_softmmu=
TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH=""
@@ -3104,6 +3105,7 @@ case "$target_arch2" in
;;
lm32)
target_phys_bits=32
+ target_libs_softmmu="$opengl_libs"
;;
m68k)
bflt="yes"
@@ -3118,6 +3120,7 @@ case "$target_arch2" in
bflt="yes"
target_nptl="yes"
target_phys_bits=32
+ target_libs_softmmu="$fdt_libs"
;;
mips|mipsel)
TARGET_ARCH=mips
@@ -3142,6 +3145,7 @@ case "$target_arch2" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=32
target_nptl="yes"
+ target_libs_softmmu="$fdt_libs"
;;
ppcemb)
TARGET_BASE_ARCH=ppc
@@ -3149,6 +3153,7 @@ case "$target_arch2" in
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
target_nptl="yes"
+ target_libs_softmmu="$fdt_libs"
;;
ppc64)
TARGET_BASE_ARCH=ppc
@@ -3156,6 +3161,7 @@ case "$target_arch2" in
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
target_long_alignment=8
+ target_libs_softmmu="$fdt_libs"
;;
ppc64abi32)
TARGET_ARCH=ppc64
@@ -3164,6 +3170,7 @@ case "$target_arch2" in
echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_phys_bits=64
+ target_libs_softmmu="$fdt_libs"
;;
sh4|sh4eb)
TARGET_ARCH=sh4
@@ -3249,7 +3256,7 @@ fi
if test "$target_softmmu" = "yes" ; then
echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
echo "CONFIG_SOFTMMU=y" >> $config_target_mak
- echo "LIBS+=$libs_softmmu" >> $config_target_mak
+ echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
fi
--
1.7.2.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH] configure: support target dependent linking
2011-04-25 22:24 ` [Qemu-devel] [PATCH] " Michael Walle
@ 2011-04-26 6:28 ` Edgar E. Iglesias
2011-04-26 21:32 ` Aurelien Jarno
1 sibling, 0 replies; 11+ messages in thread
From: Edgar E. Iglesias @ 2011-04-26 6:28 UTC (permalink / raw)
To: Michael Walle; +Cc: qemu-devel, Aurelien Jarno, Alexander Graf
On Tue, Apr 26, 2011 at 12:24:07AM +0200, Michael Walle wrote:
> This patch is the first attempt to make configure more intelligent with
> regard to how it links to libraries. It divides the softmmu libraries into
> two lists, a general one and a list which depends on the target
> architecture.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Looks good, thanks.
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: support target dependent linking
2011-04-25 22:24 ` [Qemu-devel] [PATCH] " Michael Walle
2011-04-26 6:28 ` Edgar E. Iglesias
@ 2011-04-26 21:32 ` Aurelien Jarno
1 sibling, 0 replies; 11+ messages in thread
From: Aurelien Jarno @ 2011-04-26 21:32 UTC (permalink / raw)
To: Michael Walle; +Cc: Edgar E. Iglesias, qemu-devel, Alexander Graf
On Tue, Apr 26, 2011 at 12:24:07AM +0200, Michael Walle wrote:
> This patch is the first attempt to make configure more intelligent with
> regard to how it links to libraries. It divides the softmmu libraries into
> two lists, a general one and a list which depends on the target
> architecture.
>
> Signed-off-by: Michael Walle <michael@walle.cc>
> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
> ---
> configure | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
Thanks, both applied.
> diff --git a/configure b/configure
> index da2da04..ca675f6 100755
> --- a/configure
> +++ b/configure
> @@ -1946,11 +1946,11 @@ int main(void) { return 0; }
> EOF
> if compile_prog "" "$fdt_libs" ; then
> fdt=yes
> - libs_softmmu="$fdt_libs $libs_softmmu"
> else
> if test "$fdt" = "yes" ; then
> feature_not_found "fdt"
> fi
> + fdt_libs=
> fdt=no
> fi
> fi
> @@ -1967,11 +1967,11 @@ int main(void) { GL_VERSION; return 0; }
> EOF
> if compile_prog "" "-lGL" ; then
> opengl=yes
> - libs_softmmu="$opengl_libs $libs_softmmu"
> else
> if test "$opengl" = "yes" ; then
> feature_not_found "opengl"
> fi
> + opengl_libs=
> opengl=no
> fi
> fi
> @@ -3071,6 +3071,7 @@ target_short_alignment=2
> target_int_alignment=4
> target_long_alignment=4
> target_llong_alignment=8
> +target_libs_softmmu=
>
> TARGET_ARCH="$target_arch2"
> TARGET_BASE_ARCH=""
> @@ -3104,6 +3105,7 @@ case "$target_arch2" in
> ;;
> lm32)
> target_phys_bits=32
> + target_libs_softmmu="$opengl_libs"
> ;;
> m68k)
> bflt="yes"
> @@ -3118,6 +3120,7 @@ case "$target_arch2" in
> bflt="yes"
> target_nptl="yes"
> target_phys_bits=32
> + target_libs_softmmu="$fdt_libs"
> ;;
> mips|mipsel)
> TARGET_ARCH=mips
> @@ -3142,6 +3145,7 @@ case "$target_arch2" in
> gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=32
> target_nptl="yes"
> + target_libs_softmmu="$fdt_libs"
> ;;
> ppcemb)
> TARGET_BASE_ARCH=ppc
> @@ -3149,6 +3153,7 @@ case "$target_arch2" in
> gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=64
> target_nptl="yes"
> + target_libs_softmmu="$fdt_libs"
> ;;
> ppc64)
> TARGET_BASE_ARCH=ppc
> @@ -3156,6 +3161,7 @@ case "$target_arch2" in
> gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=64
> target_long_alignment=8
> + target_libs_softmmu="$fdt_libs"
> ;;
> ppc64abi32)
> TARGET_ARCH=ppc64
> @@ -3164,6 +3170,7 @@ case "$target_arch2" in
> echo "TARGET_ABI32=y" >> $config_target_mak
> gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
> target_phys_bits=64
> + target_libs_softmmu="$fdt_libs"
> ;;
> sh4|sh4eb)
> TARGET_ARCH=sh4
> @@ -3249,7 +3256,7 @@ fi
> if test "$target_softmmu" = "yes" ; then
> echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
> echo "CONFIG_SOFTMMU=y" >> $config_target_mak
> - echo "LIBS+=$libs_softmmu" >> $config_target_mak
> + echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
> echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
> echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
> fi
> --
> 1.7.2.3
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH 2/2] configure: reenable opengl by default
2011-04-25 20:04 ` Aurelien Jarno
2011-04-25 21:44 ` Michael Walle
2011-04-25 22:09 ` [Qemu-devel] [PATCH 1/2] configure: support " Michael Walle
@ 2011-04-25 22:09 ` Michael Walle
2 siblings, 0 replies; 11+ messages in thread
From: Michael Walle @ 2011-04-25 22:09 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Walle, Alexander Graf, Aurelien Jarno
Because the opengl library is only linked to for the lm32 target, we can
now safely enable opengl by default again.
Signed-off-by: Michael Walle <michael@walle.cc>
---
configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 9825b12..6c131dd 100755
--- a/configure
+++ b/configure
@@ -177,7 +177,7 @@ spice=""
rbd=""
smartcard=""
smartcard_nss=""
-opengl="no"
+opengl=""
# parse CC options first
for opt do
--
1.7.2.3
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-04-26 21:32 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-14 21:14 [Qemu-devel] [RFC][PATCH] configure: target dependent linking Michael Walle
2011-04-25 20:04 ` Aurelien Jarno
2011-04-25 21:44 ` Michael Walle
2011-04-25 21:49 ` Alexander Graf
2011-04-25 22:09 ` [Qemu-devel] [PATCH 1/2] configure: support " Michael Walle
2011-04-26 5:39 ` Edgar E. Iglesias
2011-04-25 22:24 ` [Qemu-devel] [PATCH v2] " Michael Walle
2011-04-25 22:24 ` [Qemu-devel] [PATCH] " Michael Walle
2011-04-26 6:28 ` Edgar E. Iglesias
2011-04-26 21:32 ` Aurelien Jarno
2011-04-25 22:09 ` [Qemu-devel] [PATCH 2/2] configure: reenable opengl by default Michael Walle
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).