summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-benchmark/libhugetlbfs
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-08-26 09:25:24 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-08-31 20:02:23 +0200
commit8023363d8207058c55edc420c7302443cfaaaf75 (patch)
tree6037f366c69283f40950d248fd5c268def4ebe0a /meta-oe/recipes-benchmark/libhugetlbfs
parent1d614260cae90c1675d56cef7ea9d1665d4393b2 (diff)
downloadmeta-openembedded-8023363d8207058c55edc420c7302443cfaaaf75.tar.gz
libhugetlbfs: avoid search host library path for cross compilation
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. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark/libhugetlbfs')
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch40
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
new file mode 100644
index 000000000..15664884b
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
@@ -0,0 +1,40 @@
1From 889e52753d30179ba4ac940023cb4ed561436ab8 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Tue, 4 Nov 2014 00:49:11 -0800
4Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for cross compilation
5
6Upstream-Status: Inappropriate [cross compile specific]
7
8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9---
10 ldscripts/elf_i386.xB | 1 -
11 ldscripts/elf_i386.xBDT | 1 -
12 2 files changed, 2 deletions(-)
13
14diff --git a/ldscripts/elf_i386.xB b/ldscripts/elf_i386.xB
15index 43fe51c..eae0fa8 100644
16--- a/ldscripts/elf_i386.xB
17+++ b/ldscripts/elf_i386.xB
18@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
19 "elf32-i386")
20 OUTPUT_ARCH(i386)
21 ENTRY(_start)
22-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
23 INPUT(-lhugetlbfs);
24 /* Do we need any of these for elf?
25 __DYNAMIC = 0; */
26diff --git a/ldscripts/elf_i386.xBDT b/ldscripts/elf_i386.xBDT
27index d72aebe..3bac1b1 100644
28--- a/ldscripts/elf_i386.xBDT
29+++ b/ldscripts/elf_i386.xBDT
30@@ -3,7 +3,6 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386",
31 "elf32-i386")
32 OUTPUT_ARCH(i386)
33 ENTRY(_start)
34-SEARCH_DIR("/usr/i486-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
35 INPUT(-lhugetlbfs);
36 /* Do we need any of these for elf?
37 __DYNAMIC = 0; */
38--
391.7.9.5
40
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index a2d3922cc..ae5e46a46 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -17,6 +17,7 @@ SRC_URI = " \
17 file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ 17 file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
18 file://tests-Makefile-install-static-4G-edge-testcases.patch \ 18 file://tests-Makefile-install-static-4G-edge-testcases.patch \
19 file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ 19 file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
20 file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
20" 21"
21 22
22S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"