From patchwork Thu Apr 24 10:33:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 28958 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E0EB203AC for ; Thu, 24 Apr 2014 10:33:52 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf12897117oag.5 for ; Thu, 24 Apr 2014 03:33:52 -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: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=1kbP03hTeZIig2lPsludvZ+FkPpwUfh52CvCiITj+oc=; b=ksGRA5OmvEdZKCJqdY4cG8suBPUM62z0lpgbhB7bMRyTb8ZvcgWttp9isOL4BE0/fb F+KcbBCXyK3ICmjQgiYPOawOAhZxdFgToGOG7O1UBts5aX0kLQP03PDcI51MhA+w/0ux jh0alSRmnlf0udlVagyZH3sCZRaIOHkwbqR9V5/DW1uzNniguY54wKv6GH30+kqnx6fv df0wLZzA48KuFN6+F4l3iILGxkBlJn7FZdtg1y658FBWWCiEfrkd51ESo8/q/G8DTgzZ x2X6YqiK3B/1+H11ByWElfTS9VY4bYE5aruB9HruvHs24cC3ZMmRtF0r1kHSzz8mfp07 i6yQ== X-Gm-Message-State: ALoCoQmHMZvWbDx6FmodwWLvKegt+kTHCObyDbt5Un4XEMcZ8bz7NaSXTBIWdTubFNgKMwWgJT4x X-Received: by 10.43.92.68 with SMTP id bp4mr701149icc.26.1398335632085; Thu, 24 Apr 2014 03:33:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.201 with SMTP id k67ls1062683qge.22.gmail; Thu, 24 Apr 2014 03:33:52 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr729747vec.28.1398335631970; Thu, 24 Apr 2014 03:33:51 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id sw4si815821vdc.192.2014.04.24.03.33.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Apr 2014 03:33:51 -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.220.172; Received: by mail-vc0-f172.google.com with SMTP id la4so2726266vcb.3 for ; Thu, 24 Apr 2014 03:33:51 -0700 (PDT) X-Received: by 10.221.34.7 with SMTP id sq7mr694555vcb.5.1398335631884; Thu, 24 Apr 2014 03:33:51 -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 ib8csp5079vcb; Thu, 24 Apr 2014 03:33:51 -0700 (PDT) X-Received: by 10.68.194.229 with SMTP id hz5mr63921693pbc.91.1398335630893; Thu, 24 Apr 2014 03:33:50 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id hu10si2409705pbc.229.2014.04.24.03.33.50 for ; Thu, 24 Apr 2014 03:33:50 -0700 (PDT) Received-SPF: none (google.com: openembedded-core-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 AFE5E65DAB; Thu, 24 Apr 2014 10:33:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mail.openembedded.org (Postfix) with ESMTP id E279965DAB for ; Thu, 24 Apr 2014 10:33:33 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id hm4so993252wib.2 for ; Thu, 24 Apr 2014 03:33:34 -0700 (PDT) X-Received: by 10.180.184.167 with SMTP id ev7mr5740484wic.55.1398335613987; Thu, 24 Apr 2014 03:33:33 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id uc3sm9822442wib.10.2014.04.24.03.33.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2014 03:33:33 -0700 (PDT) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Thu, 24 Apr 2014 12:33:27 +0200 Message-Id: <1398335607-12046-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [OE-core] [PATCHv2] git: fix perl binding installation X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-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. Fix the problem at the source so that Git.pm ends up in the correct dir *and* doesn't get deleted. The perl.mak file gets updated during the regular do_install, so add an extra make install step to install the *.pm files to the correct directory. This is the first step in making git-perltools actually work. Signed-off-by: Koen Kooi --- meta/recipes-devtools/git/git.inc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index f5013f1..aa9ca28 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -23,15 +23,24 @@ 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 + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ + -e 's#/lib/perl-native#/lib#g' \ + ${S}/perl/perl.mak + + cd ${S}/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. rm -rf ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || true } PERLSEDFIXUP = " \ @@ -75,6 +84,7 @@ PERLTOOLS = " \ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"