CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libhugetlbfs: x86 - don't link against host libs

Browse Source 
An earlier patch from Chunrong Guo <B40290@freescale.com> fixed the
linker command scripts in ldscripts to comment out hard-coded paths
for the linker search directories.  This allows the command line
to specifiy the proper paths without being overridden.
However, the 32-bit ix86 scripts evidently were added after this
earlier patch was created and were not corrected by it - so here
we simply duplicate the technique in the earlier patch and extend it
to correct the linker scripts for 32-bit ix86 builds.

Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
gary.robertson@linaro.org 2015-04-13 23:19:00 -05:00 committed by Armin Kuster
parent 1235f48667
commit 6d78face56
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
meta-oe/recipes-benchmark/libhugetlbfs/files/0001-x86-avoid-host-library-search-in-cross-dev.patch Normal file
View File

@ -0,0 +1,48 @@
From b028ae9f43111677056f2661c800096f1994b687 Mon Sep 17 00:00:00 2001
From: "Gary S. Robertson" <gary.robertson@linaro.org>
Date: Mon, 13 Apr 2015 14:41:15 -0500
Subject: [PATCH] libhugetlbfs: x86 avoid host library search in cross-dev
Upstream-Status: Inappropriate [oe-core specific]
The ldscripts for 32-bit ix86 architectures were not corrected by the earlier
patch from Chunrong Guo <B40290@freescale.com>... presumably they were added
after that patch was created. Here we extend the same technique to include
the 32-bit ix86 linker scripts, so the command line variables can set the
linker search directories rather than using hard-coded paths in the ldscripts.
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
---
ldscripts/elf_i386.xB | 2 +-
ldscripts/elf_i386.xBDT | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ldscripts/elf_i386.xB b/ldscripts/elf_i386.xB
index 43fe51c..b852781 100644
--- a/ldscripts/elf_i386.xB
+++ b/ldscripts/elf_i386.xB
@@ -3,7 +3,7 @@ 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");
+/*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..b25e225 100644
--- a/ldscripts/elf_i386.xBDT
+++ b/ldscripts/elf_i386.xBDT
@@ -3,7 +3,7 @@ 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");
+/*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.9.1

1
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
View File

@ -22,6 +22,7 @@ SRC_URI = " \
file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \
file://0001-Extend-arm32-support-to-include-BE-variants.patch \
file://0001-Makefile-Recognize-all-ix86-arches.patch \
file://0001-x86-avoid-host-library-search-in-cross-dev.patch \
"
S = "${WORKDIR}/git"