[meta-freescale] [meta-fsl-ppc master 3/4] qemu: configure properly check if -lrt is needed

[McClintock Matthew-B29882]

On Thu, Feb 28, 2013 at 6:27 AM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> On Thu, Feb 28, 2013 at 5:54 AM, Zhenhua Luo <zhenhua.luo at freescale.com> wrote:
>> From: Ting Liu <b28495 at freescale.com>
>>
>> Back port from:
>> http://git.qemu.org/?p=qemu.git;a=commit;h=8bacde8d86a09699207d85d4bab06162aed18dc4
>>
>> Fix the below build issue:
>> | ../qemu-timer.o: In function `dynticks_rearm_timer':
>> | .../qemu/1.0+fsl-r2/git/qemu-timer.c:597: undefined reference to `timer_gettime'
>> | .../qemu/1.0+fsl-r2/git/qemu-timer.c:610: undefined reference to `timer_settime'
>> | ../qemu-timer.o: In function `dynticks_stop_timer':
>> | .../qemu/1.0+fsl-r2/git/qemu-timer.c:583: undefined reference to `timer_delete'
>> | ../qemu-timer.o: In function `dynticks_start_timer':
>> | .../qemu/1.0+fsl-r2/git/qemu-timer.c:565: undefined reference to `timer_create'
>> | ivshmem.o: In function `pci_ivshmem_init':
>> | .../qemu/1.0+fsl-r2/git/hw/ivshmem.c:720: undefined reference to `shm_open'
>> | .../qemu/1.0+fsl-r2/git/hw/ivshmem.c:727: undefined reference to `shm_open'
>> | collect2: error: ld returned 1 exit status
>> | make[1]: *** [qemu-system-ppc] Error 1
>> | make: *** [subdir-ppc-softmmu] Error 2
>> | ERROR: oe_runmake failed
>> | ERROR: Function failed: do_compile
>>
>> Signed-off-by: Ting Liu <b28495 at freescale.com>
>
> Good.

Did we check with Staurt to see if we can get him to add this patch to
his tree at git.freescale.com?

-M

>
>> ---
>>  ...configure-properly-check-if-lrt-is-needed.patch |   25 ++++++++++++++++++++
>
> Please check http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations
>
> Please add the description, signed-off-by and upstream status in the
> patch file. This makes easy to find out where it come from, why and if
> it is a backport of a fix which still needs to be send to upstream.
>
>>  recipes-devtools/qemu/qemu_1.0.bb                  |    6 +++--
>>  2 files changed, 29 insertions(+), 2 deletions(-)
>>  create mode 100644 recipes-devtools/qemu/files/configure-properly-check-if-lrt-is-needed.patch
>>
>> diff --git a/recipes-devtools/qemu/files/configure-properly-check-if-lrt-is-needed.patch b/recipes-devtools/qemu/files/configure-properly-check-if-lrt-is-needed.patch
>> new file mode 100644
>> index 0000000..8c5eec5
>> --- /dev/null
>> +++ b/recipes-devtools/qemu/files/configure-properly-check-if-lrt-is-needed.patch
>> @@ -0,0 +1,25 @@
>> +diff --git a/configure b/configure
>> +index 999375a..29b3e30 100755
>> +--- a/configure
>> ++++ b/configure
>> +@@ -2444,13 +2444,18 @@ fi
>> + cat > $TMPC <<EOF
>> + #include <signal.h>
>> + #include <time.h>
>> +-int main(void) { clockid_t id; return clock_gettime(id, NULL); }
>> ++int main(void) {
>> ++  timer_create(CLOCK_REALTIME, NULL, NULL);
>> ++  return clock_gettime(CLOCK_REALTIME, NULL);
>> ++}
>> + EOF
>> +
>> + if compile_prog "" "" ; then
>> +   :
>> +-elif compile_prog "" "-lrt" ; then
>> ++# we need pthread for static linking. use previous pthread test result
>> ++elif compile_prog "" "-lrt $pthread_lib" ; then
>> +   LIBS="-lrt $LIBS"
>> ++  libs_qga="-lrt $libs_qga"
>> + fi
>> +
>> + if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
>> diff --git a/recipes-devtools/qemu/qemu_1.0.bb b/recipes-devtools/qemu/qemu_1.0.bb
>> index ff4afde..86268aa 100644
>> --- a/recipes-devtools/qemu/qemu_1.0.bb
>> +++ b/recipes-devtools/qemu/qemu_1.0.bb
>> @@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
>>
>>  # This means v1.0 with FSL specific patches applied
>>  PV = "1.0+fsl"
>> -PR = "r2"
>> +PR = "r3"
>>
>>  DEPENDS += "dtc"
>>
>> -SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git"
>> +SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git \
>> +            file://configure-properly-check-if-lrt-is-needed.patch \
>> +"
>>  SRCREV = "7feabd47a814214dc4bebfd97d0eaf30dc50a68f"
>>
>>  S = "${WORKDIR}/git"
>> --
>> 1.7.9.5
>>
>>
>> _______________________________________________
>> meta-freescale mailing list
>> meta-freescale at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-freescale
>
>
>
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale