Re: [meta-oe][PATCH] libhugetlbfs: avoid search host library path for cross compilation

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3811 bytes --]

On Tue, Nov 04, 2014 at 04:22:17AM -0500, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> There was a patch fixing the same issue:
> libhugetlbfs-avoid-search-host-library-path-for-cros.patch
> 
> but missed the elf_i386.xB*, this patch fixes for it.

Please test the changes you're sending.

libhugetlbfs-elf_i386-avoid-search-host-library-path.patch is in wrong
directory and not found in do_fetch task.

> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>  .../libhugetlbfs/libhugetlbfs_git.bb               |    1 +
>  ...s-elf_i386-avoid-search-host-library-path.patch |   40 ++++++++++++++++++++
>  2 files changed, 41 insertions(+)
>  create mode 100644 recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
> 
> diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> index c2262ea..9469639 100644
> --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> @@ -19,6 +19,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \
>      file://0001-aarch64-fix-page-size-not-properly-computed.patch \
>      file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \
>      file://0001-Extend-arm32-support-to-include-BE-variants.patch \
> +    file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
>  "
>  
>  S = "${WORKDIR}/git"
> diff --git a/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
> new file mode 100644
> index 0000000..8a34e9d
> --- /dev/null
> +++ b/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
> @@ -0,0 +1,40 @@
> +From 889e52753d30179ba4ac940023cb4ed561436ab8 Mon Sep 17 00:00:00 2001
> +From: Jackie Huang <jackie.huang@windriver.com>
> +Date: Tue, 4 Nov 2014 00:49:11 -0800
> +Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for cross compilation
> +
> +Upstream-Status: Inappropriate [cross compile specific]
> +
> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> +---
> + ldscripts/elf_i386.xB   |    1 -
> + ldscripts/elf_i386.xBDT |    1 -
> + 2 files changed, 2 deletions(-)
> +
> +diff --git a/ldscripts/elf_i386.xB b/ldscripts/elf_i386.xB
> +index 43fe51c..eae0fa8 100644
> +--- a/ldscripts/elf_i386.xB
> ++++ b/ldscripts/elf_i386.xB
> +@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
> + 	      "elf32-i386")
> + OUTPUT_ARCH(i386)
> + ENTRY(_start)
> +-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
> + INPUT(-lhugetlbfs);
> + /* Do we need any of these for elf?
> +    __DYNAMIC = 0;    */
> +diff --git a/ldscripts/elf_i386.xBDT b/ldscripts/elf_i386.xBDT
> +index d72aebe..3bac1b1 100644
> +--- a/ldscripts/elf_i386.xBDT
> ++++ b/ldscripts/elf_i386.xBDT
> +@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
> + 	      "elf32-i386")
> + OUTPUT_ARCH(i386)
> + ENTRY(_start)
> +-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
> + INPUT(-lhugetlbfs);
> + /* Do we need any of these for elf?
> +    __DYNAMIC = 0;    */
> +-- 
> +1.7.9.5
> +
> -- 
> 1.7.9.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]