From patchwork Fri May 2 08:24:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 29532 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 72EED203F3 for ; Fri, 2 May 2014 08:24:49 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id hr9sf13980586vcb.11 for ; Fri, 02 May 2014 01:24:49 -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:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=XCO8OeG4GHLOj52F3LBRqz3q1/mkhtF7fgiDxhpzc1E=; b=ZkNNIDW8r5RdM7DjmscSadctkHqnwizTOYqXEiIOBboFZLHFETca5Ckp8s6onTKuev pOXdcZYcSXWQ/uzgjLOadI6slZB4Rs5nVai/pc1rlvx4AdfxZLEoqIdtoRpm42FbLP93 lqLR7vqfspYhmgZdh2EZ0ZAx5XOU7s3+kTTLnYWIQKptq6VTtRUSKYK8qyuU4gxFsSN5 Umq8WXJfn8pcf7XqU2sAIC2eTE6lw54D/PBSyfuhEilT5jWz47EdulAw/X9okl6UvytK JZZ4NXjCtorWYvhRd7DySVixRnICq+nVrzbnXEpMWyZOFDspDAlQwB/s2Gkq3rkefJC9 CLoQ== X-Gm-Message-State: ALoCoQl+WIbpbumD6c/3J4CVe5alU+BSrGdzsQ7M0dfFksyp4nNTVz13rbD8esKr89ewwLq4g1kI X-Received: by 10.224.147.72 with SMTP id k8mr8143956qav.5.1399019089059; Fri, 02 May 2014 01:24:49 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.247 with SMTP id b110ls1420255qge.16.gmail; Fri, 02 May 2014 01:24:48 -0700 (PDT) X-Received: by 10.220.167.2 with SMTP id o2mr12537520vcy.8.1399019088959; Fri, 02 May 2014 01:24:48 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id rm10si6588683vcb.67.2014.05.02.01.24.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 01:24:48 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id pa12so4123099veb.32 for ; Fri, 02 May 2014 01:24:48 -0700 (PDT) X-Received: by 10.220.190.197 with SMTP id dj5mr12384846vcb.19.1399019088893; Fri, 02 May 2014 01:24:48 -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.220.221.72 with SMTP id ib8csp85438vcb; Fri, 2 May 2014 01:24:48 -0700 (PDT) X-Received: by 10.66.102.39 with SMTP id fl7mr31654458pab.43.1399019087733; Fri, 02 May 2014 01:24:47 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id tb3si7011513pab.301.2014.05.02.01.24.46 for ; Fri, 02 May 2014 01:24:47 -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 D1E9860702; Fri, 2 May 2014 08:24:42 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by mail.openembedded.org (Postfix) with ESMTP id 36249605B2 for ; Fri, 2 May 2014 08:24:37 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id u56so4269368wes.28 for ; Fri, 02 May 2014 01:24:38 -0700 (PDT) X-Received: by 10.194.77.50 with SMTP id p18mr97349wjw.68.1399019078089; Fri, 02 May 2014 01:24:38 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id u1sm1030808wjx.16.2014.05.02.01.24.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 May 2014 01:24:37 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Fri, 2 May 2014 10:24:35 +0200 Message-Id: <1399019075-15195-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCHv3] git: fix perl binding installation 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: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 Git.pm wasn't ending up in the package because do_install removed it with a misleading comment about multilib. Workaround the problem so that Git.pm ends up in the correct dir *and* doesn't get deleted. Signed-off-by: Koen Kooi --- meta/recipes-devtools/git/git.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 73e11eb..c6ff843 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -23,15 +23,22 @@ do_compile_prepend () { rm -f perl/perl.mak } +# The perl portion fails with -j16 +PARALLEL_MAKEINST = "" + do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python + cd ${B}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} + # ${libdir} is not applicable here, perl-native files are always # installed to /usr/lib on both 32/64 bits targets. + # Fix up build paths and point to target locations. + mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${exec_prefix}/lib/perl + sed -i -e s:${D}::g ${D}${exec_prefix}/lib/perl/*/auto/Git/.packlist rm -rf ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || true } PERLSEDFIXUP = " \ @@ -75,6 +82,7 @@ PERLTOOLS = " \ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path liberror-perl findutils"