diff options
Diffstat (limited to 'meta/recipes-devtools/git/git.inc')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index dd9d792c5c..26a22ac1e8 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -52,13 +52,6 @@ perl_native_fixup () { | |||
52 | -e 's#${libdir}/perl-native/#${libdir}/#' \ | 52 | -e 's#${libdir}/perl-native/#${libdir}/#' \ |
53 | ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')} | 53 | ${@d.getVar("PERLTOOLS").replace(' /',d.getVar('D') + '/')} |
54 | 54 | ||
55 | # ${libdir} is not applicable here, perl-native files are always | ||
56 | # installed to /usr/lib on both 32/64 bits targets. | ||
57 | |||
58 | mkdir -p ${D}${libdir} | ||
59 | mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${libdir} | ||
60 | rmdir -p ${D}${exec_prefix}/lib/perl-native || true | ||
61 | |||
62 | if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then | 55 | if [ ! "${@bb.utils.filter('PACKAGECONFIG', 'cvsserver', d)}" ]; then |
63 | # Only install the git cvsserver command if explicitly requested | 56 | # Only install the git cvsserver command if explicitly requested |
64 | # as it requires the DBI Perl module, which does not exist in | 57 | # as it requires the DBI Perl module, which does not exist in |
@@ -72,8 +65,7 @@ perl_native_fixup () { | |||
72 | # if explicitly requested as they require the SVN::Core Perl | 65 | # if explicitly requested as they require the SVN::Core Perl |
73 | # module, which does not exist in OE-Core. | 66 | # module, which does not exist in OE-Core. |
74 | rm -r ${D}${libexecdir}/git-core/git-svn \ | 67 | rm -r ${D}${libexecdir}/git-core/git-svn \ |
75 | ${D}${libdir}/perl/site_perl/*/Git/SVN* | 68 | ${D}${datadir}/perl5/Git/SVN* |
76 | sed -i -e '/SVN/d' ${D}${libdir}/perl/site_perl/*/auto/Git/.packlist | ||
77 | fi | 69 | fi |
78 | } | 70 | } |
79 | 71 | ||
@@ -124,7 +116,7 @@ PACKAGES =+ "${PN}-perltools" | |||
124 | FILES_${PN}-perltools += " \ | 116 | FILES_${PN}-perltools += " \ |
125 | ${PERLTOOLS} \ | 117 | ${PERLTOOLS} \ |
126 | ${libdir}/perl \ | 118 | ${libdir}/perl \ |
127 | ${datadir}/perl \ | 119 | ${datadir}/perl5 \ |
128 | " | 120 | " |
129 | 121 | ||
130 | RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" | 122 | RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" |