summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-25 22:33:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 12:13:13 +0100
commit2637809901aca14f1fe8367ba0a081aaf470df05 (patch)
treed6890e5b009c29eea95df42c497cc6deb4d1058b
parentbf97b1a311b2621be9da6b4e5611fca6444e4c27 (diff)
downloadpoky-2637809901aca14f1fe8367ba0a081aaf470df05.tar.gz
cpan_build: Unify directory layout for native and target builds
There seems to be no benefit in having them be different and this appears to cause a certain amount of confusion about paths for the native modules. (From OE-Core rev: 3926a45a26c2d23d9c2fc9c3956f780f607ec7a4) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cpan_build.bbclass7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 36ffc56b85..080960212d 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -23,8 +23,9 @@ cpan_build_do_configure () {
23 if [ ${@is_target(d)} == "yes" ]; then 23 if [ ${@is_target(d)} == "yes" ]; then
24 # build for target 24 # build for target
25 . ${STAGING_LIBDIR}/perl/config.sh 25 . ${STAGING_LIBDIR}/perl/config.sh
26 fi
26 27
27 perl Build.PL --installdirs vendor \ 28 perl Build.PL --installdirs vendor \
28 --destdir ${D} \ 29 --destdir ${D} \
29 --install_path lib="${datadir}/perl" \ 30 --install_path lib="${datadir}/perl" \
30 --install_path arch="${libdir}/perl" \ 31 --install_path arch="${libdir}/perl" \
@@ -32,10 +33,6 @@ cpan_build_do_configure () {
32 --install_path bin=${bindir} \ 33 --install_path bin=${bindir} \
33 --install_path bindoc=${mandir}/man1 \ 34 --install_path bindoc=${mandir}/man1 \
34 --install_path libdoc=${mandir}/man3 35 --install_path libdoc=${mandir}/man3
35 else
36 # build for host
37 perl Build.PL --installdirs site --destdir ${D}
38 fi
39} 36}
40 37
41cpan_build_do_compile () { 38cpan_build_do_compile () {