From patchwork Tue Apr 14 04:19:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary.robertson@linaro.org X-Patchwork-Id: 47136 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E5BFD20553 for ; Tue, 14 Apr 2015 04:20:38 +0000 (UTC) Received: by wgtl5 with SMTP id l5sf21917708wgt.1 for ; Mon, 13 Apr 2015 21:20:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:mime-version:content-type:content-transfer-encoding :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=PfV63WInd4PRKI5rwYd72lsw/v6yIdszX6oG4mc2YSI=; b=lj7e6mx4SsqRQhxv0bxoCNylF1oMrnd7XscEu1DxI2yVIUYa/gzYn+cOxxoBJKiwpB k4am1MTEwbUjycNS0YWQL7IcwiE8Nj0PWcUzk0/ma+gelxdUPtQMrLTx0KZFhuw6RIgw rqaehvbcsXRkAwteWQXEM8nFIIoJ3NEZclgodWKcQ2pdNOMjbtFjzMHHKdQpfUezd5PD Fy4DssaSUnEW/WyQdBAxJts2fOGhtAtKDo+SgiQ9Psa3JMnOQxiTpaaOoWVfbYqZ6jGV WVuDgY8MIGAGTFsz0Jj88Z8bDUqbc/2UBTihn866LcMc0wD+R3WXqc/4WbS4tkSzB9PC MrnQ== X-Gm-Message-State: ALoCoQkyUO+zJuNnA9WYuNXXThwwTU1S+IPyFO9E1HutWBYVqtdfTiRNRZ/wStwbSJjylf3UfxpG X-Received: by 10.112.142.170 with SMTP id rx10mr1975813lbb.12.1428985237962; Mon, 13 Apr 2015 21:20:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.163 with SMTP id r3ls789235laj.70.gmail; Mon, 13 Apr 2015 21:20:37 -0700 (PDT) X-Received: by 10.112.210.230 with SMTP id mx6mr16281199lbc.64.1428985237715; Mon, 13 Apr 2015 21:20:37 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id kx6si9933863lac.141.2015.04.13.21.20.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2015 21:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbuc2 with SMTP id uc2so74941409lbb.2 for ; Mon, 13 Apr 2015 21:20:37 -0700 (PDT) X-Received: by 10.112.8.101 with SMTP id q5mr16279419lba.19.1428985237324; Mon, 13 Apr 2015 21:20:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp1604653lbt; Mon, 13 Apr 2015 21:20:36 -0700 (PDT) X-Received: by 10.68.251.227 with SMTP id zn3mr32538463pbc.157.1428985235423; Mon, 13 Apr 2015 21:20:35 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id fj8si15181031pdb.93.2015.04.13.21.20.34; Mon, 13 Apr 2015 21:20:35 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 30E4773CC5; Tue, 14 Apr 2015 04:20:31 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-qk0-f182.google.com (mail-qk0-f182.google.com [209.85.220.182]) by mail.openembedded.org (Postfix) with ESMTP id 4ED346AC28 for ; Tue, 14 Apr 2015 04:19:34 +0000 (UTC) Received: by qkhg7 with SMTP id g7so218847084qkh.2 for ; Mon, 13 Apr 2015 21:19:36 -0700 (PDT) X-Received: by 10.182.34.131 with SMTP id z3mr14889223obi.4.1428985174887; Mon, 13 Apr 2015 21:19:34 -0700 (PDT) Received: from honkintosh.cybertech.lan (65-120-133-114.dia.static.qwest.net. [65.120.133.114]) by mx.google.com with ESMTPSA id l140sm5714238oig.20.2015.04.13.21.19.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Apr 2015 21:19:33 -0700 (PDT) From: "Gary S. Robertson" To: Martin Jansa Date: Mon, 13 Apr 2015 23:19:00 -0500 Message-Id: <1428985140-4170-2-git-send-email-gary.robertson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428985140-4170-1-git-send-email-gary.robertson@linaro.org> References: <20150413134540.GG2330@jama> <1428985140-4170-1-git-send-email-gary.robertson@linaro.org> Cc: openembedded-devel Subject: [oe] [PATCH] libhugetlbfs: x86 - don't link against host libs X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: gary.robertson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 An earlier patch from Chunrong Guo 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 --- ...86-avoid-host-library-search-in-cross-dev.patch | 48 ++++++++++++++++++++++ .../libhugetlbfs/libhugetlbfs_git.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-x86-avoid-host-library-search-in-cross-dev.patch 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" +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 ... 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 +--- + 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 6fe5dce..25f1672 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -20,6 +20,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \ 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"