[oe-commits] org.oe.dev perl/perl-native 5.8.8: Change the installation directories used for

[lenehan commit]

perl/perl-native 5.8.8: Change the installation directories used for
perl-native to remove the various directories and to remove the host
specific path components. This is to make it easier to refer to the staged
perl location from other places, such as when trying to tell things where
the perl include files are located.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 4aa7a6a4f950609427a876c60ced55f0fe0c6cc2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4aa7a6a4f950609427a876c60ced55f0fe0c6cc2
Files:
1
packages/perl/perl-native_5.8.8.bb
packages/perl/perl_5.8.8.bb
Diffs:

#
# mt diff -r8837110e3d0f6c9f2e4784ae55f531e27e3cd6c9 -r4aa7a6a4f950609427a876c60ced55f0fe0c6cc2
#
# 
# 
# patch "packages/perl/perl-native_5.8.8.bb"
#  from [3013e9425fe473cf0988c3ccf6cad2b894e62e58]
#    to [8c1ad67279089a5e838c743700554b98519f1799]
# 
# patch "packages/perl/perl_5.8.8.bb"
#  from [6adcfa20967db9b85069420c2dc62fd6a0117e80]
#    to [7cea0b09573540d2e8acfde49e5d0c19364d5d8f]
# 
============================================================
--- packages/perl/perl-native_5.8.8.bb	3013e9425fe473cf0988c3ccf6cad2b894e62e58
+++ packages/perl/perl-native_5.8.8.bb	8c1ad67279089a5e838c743700554b98519f1799
@@ -1,9 +1,9 @@ DEPENDS = "virtual/db-native gdbm-native
 DESCRIPTION = "Perl is a popular scripting language."
 HOMEPAGE = "http://www.perl.org/"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/db-native gdbm-native"
-PR = "r7"
+PR = "r8"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
 
@@ -26,7 +26,16 @@ do_configure () {
         -Dcf_by="Open Embedded" \
         -Dprefix=${prefix} \
         -Dvendorprefix=${prefix} \
-        -Dsiteprefix=${prefix}/local \
+        -Dvendorprefix=${prefix} \
+        -Dsiteprefix=${prefix} \
+        \
+        -Dprivlib=${STAGING_LIBDIR}/perl/${PV} \
+        -Darchlib=${STAGING_LIBDIR}/perl/${PV} \
+        -Dvendorlib=${STAGING_LIBDIR}/perl/${PV} \
+        -Dvendorarch=${STAGING_LIBDIR}/perl/${PV} \
+        -Dsitelib=${STAGING_LIBDIR}/perl/${PV} \
+        -Dsitearch=${STAGING_LIBDIR}/perl/${PV} \
+        \
         -Duseshrplib \
         -Dusethreads \
         -Duseithreads \
@@ -50,6 +59,9 @@ do_stage_append() {
 do_stage_append() {
         # We need a hostperl link for building perl
         ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl
+        # Store native config in non-versioned directory
+        install -d ${STAGING_DIR}/${HOST_SYS}/perl
+        install config.sh ${STAGING_DIR}/${HOST_SYS}/perl
 }
 
 PARALLEL_MAKE = ""
============================================================
--- packages/perl/perl_5.8.8.bb	6adcfa20967db9b85069420c2dc62fd6a0117e80
+++ packages/perl/perl_5.8.8.bb	7cea0b09573540d2e8acfde49e5d0c19364d5d8f
@@ -5,7 +5,7 @@ DEPENDS = "virtual/db perl-native grep-n
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r17"
+PR = "r18"
 
 # Major part of version
 PVM = "5.8"
@@ -37,7 +37,7 @@ HOSTPERL = "${STAGING_BINDIR_NATIVE}/per
 HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}"
 
 # Where to find .so files - use the -native versions not those from the target build
-export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl5/${PV}/${BUILD_ARCH}-${BUILD_OS}-thread-multi/"
+export PERLHOSTLIB = "${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/"
 
 do_configure() {
         # Make hostperl in build directory be the native perl
@@ -123,7 +123,7 @@ do_stage() {
 do_stage() {
         install -d ${STAGING_DIR}/${HOST_SYS}/perl/
         install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/
-        install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl5/${PV}/Config_heavy-target.pl
+        install lib/Config_heavy.pl ${STAGING_DIR}/${BUILD_SYS}/lib/perl/${PV}/Config_heavy-target.pl
 }
 
 PACKAGES = "perl-dbg perl perl-misc perl-lib perl-dev perl-pod perl-doc"