Patchwork lsof: add contingency for when EGLIBCVERSION is not set

login
register
mail settings
Submitter jackie huang
Date Nov. 26, 2013, 8:42 a.m.
Message ID <1385455353-24032-1-git-send-email-jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/62365/
State New
Headers show

Comments

jackie huang - Nov. 26, 2013, 8:42 a.m.
From: Paul Gortmaker <paul.gortmaker@windriver.com>

commit 8c38bc022de209187f31952ae02313dd3104f4c6 ("lsof: define
linux C library type when using eglibc") tries to avoid the
built in tests that determine EGLIBC version (since they
are not reliable in cross builds) and handed in the EGLIBCVERSION
directly.  However this is only happening if EGLIBCVERSION is
set.  And that is only true if we are sourcing the include file
meta/conf/distro/include/tcmode-default.inc  -- which we won't
be with custom toolchain.  So we've been implicitly relying on
the broken lsof tests.

So, to ensure we don't end up using the broken lsof tests,
add a contingency for the case where EGLIBCVERSION is not
set.  This will be suitable for a single release, since
the version will be unchanging.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 meta/recipes-extended/lsof/lsof_4.87.bb | 3 +++
 1 file changed, 3 insertions(+)
Randy MacLeod - Nov. 26, 2013, 4:32 p.m.
This change is not useful for oe-core.
I suppose it's being sent to be Yocto compliant and no merge is expected.

../Randy


On Tue, Nov 26, 2013 at 3:42 AM,  <jackie.huang@windriver.com> wrote:
> From: Paul Gortmaker <paul.gortmaker@windriver.com>
>
> commit 8c38bc022de209187f31952ae02313dd3104f4c6 ("lsof: define
> linux C library type when using eglibc") tries to avoid the
> built in tests that determine EGLIBC version (since they
> are not reliable in cross builds) and handed in the EGLIBCVERSION
> directly.  However this is only happening if EGLIBCVERSION is
> set.  And that is only true if we are sourcing the include file
> meta/conf/distro/include/tcmode-default.inc  -- which we won't
> be with custom toolchain.  So we've been implicitly relying on
> the broken lsof tests.
>
> So, to ensure we don't end up using the broken lsof tests,
> add a contingency for the case where EGLIBCVERSION is not
> set.  This will be suitable for a single release, since
> the version will be unchanging.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>  meta/recipes-extended/lsof/lsof_4.87.bb | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb
> index 5676cd9..582697b 100644
> --- a/meta/recipes-extended/lsof/lsof_4.87.bb
> +++ b/meta/recipes-extended/lsof/lsof_4.87.bb
> @@ -34,6 +34,9 @@ do_configure () {
>                  LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'`
>                  LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
>                  export LINUX_CLIB
> +        else
> +                LINUX_CLIB="-DGLIBCV=215"
> +                export LINUX_CLIB
>          fi
>         yes | ./Configure ${LSOF_OS}
>  }
> --
> 1.8.3
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb
index 5676cd9..582697b 100644
--- a/meta/recipes-extended/lsof/lsof_4.87.bb
+++ b/meta/recipes-extended/lsof/lsof_4.87.bb
@@ -34,6 +34,9 @@  do_configure () {
                 LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'`
                 LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
                 export LINUX_CLIB
+        else
+                LINUX_CLIB="-DGLIBCV=215"
+                export LINUX_CLIB
         fi
 	yes | ./Configure ${LSOF_OS}
 }