[oe-commits] gary.robertson at linaro.org : libhugetlbfs: x86 - don' t link against host libs
git at git.openembedded.org
git at git.openembedded.org
Wed Jun 17 20:38:27 UTC 2015
- Previous message: [oe-commits] Martin Jansa : gegl, crash, libsecret, mpg123, tinymembench, gammu, mosh, llvm3.3, breakpad, php, mozjs, libopus: disable thumb where it fails for qemuarm
- Next message: [oe-commits] Armin Kuster : problems building Gem that contains C code
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Module: meta-openembedded.git
Branch: master-next
Commit: 85ec4a289f5f37b21f9087e791dafc84b2809fe3
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=85ec4a289f5f37b21f9087e791dafc84b2809fe3
Author: gary.robertson at linaro.org <gary.robertson at linaro.org>
Date: Mon Apr 13 23:19:00 2015 -0500
libhugetlbfs: x86 - don't link against host libs
An earlier patch from Chunrong Guo <B40290 at 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 at linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
...86-avoid-host-library-search-in-cross-dev.patch | 48 ++++++++++++++++++++++
.../libhugetlbfs/libhugetlbfs_git.bb | 1 +
2 files changed, 49 insertions(+)
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-x86-avoid-host-library-search-in-cross-dev.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-x86-avoid-host-library-search-in-cross-dev.patch
new file mode 100644
index 0000000..959574e
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-x86-avoid-host-library-search-in-cross-dev.patch
@@ -0,0 +1,48 @@
+From b028ae9f43111677056f2661c800096f1994b687 Mon Sep 17 00:00:00 2001
+From: "Gary S. Robertson" <gary.robertson at 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 at 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 at 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
+
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index ce0c6af..8e561d3 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -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"
- Previous message: [oe-commits] Martin Jansa : gegl, crash, libsecret, mpg123, tinymembench, gammu, mosh, llvm3.3, breakpad, php, mozjs, libopus: disable thumb where it fails for qemuarm
- Next message: [oe-commits] Armin Kuster : problems building Gem that contains C code
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Openembedded-commits
mailing list