All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCHv4] git: fix perl binding installation
@ 2014-05-02  8:36 Koen Kooi
  2014-05-08 16:37 ` Saul Wold
  0 siblings, 1 reply; 11+ messages in thread
From: Koen Kooi @ 2014-05-02  8:36 UTC (permalink / raw)
  To: openembedded-core; +Cc: Koen Kooi

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 <koen.kooi@linaro.org>
---
 meta/recipes-devtools/git/git.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 73e11eb..178b768 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -28,10 +28,14 @@ do_install () {
 		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 +79,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"
-- 
1.9.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2014-05-12 10:08 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-02  8:36 [PATCHv4] git: fix perl binding installation Koen Kooi
2014-05-08 16:37 ` Saul Wold
2014-05-08 17:30   ` Koen Kooi
2014-05-09  5:59     ` Koen Kooi
2014-05-09  6:38       ` Saul Wold
2014-05-09  8:50         ` Koen Kooi
2014-05-09  9:16           ` Koen Kooi
2014-05-09 10:16             ` Richard Purdie
     [not found]               ` <CAP0W-Rn5PU7NxYWCKZ59R_oqHDfkRt3xEayhzfhyP-1D6OVtjw@mail.gmail.com>
     [not found]                 ` <1399631039.31891.85.camel@ted>
     [not found]                   ` <CAP0W-R=dx1GNAfXkR-SDyB6JxYBYuiD7BSZ20KiB-UZQBmkrgw@mail.gmail.com>
2014-05-12  8:15                     ` Koen Kooi
2014-05-12  9:16                       ` Richard Purdie
2014-05-12 10:08                       ` Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.