[oe-commits] org.oe.dev perl 5.8.8/cpan: Fix the installation paths for cpan modules. The installed
lenehan commit
openembedded-commits at lists.openembedded.org
Fri Apr 27 02:18:45 UTC 2007
perl 5.8.8/cpan: Fix the installation paths for cpan modules. The installed
files for perl modules built using cpan will end up in different places
depending on which version of perl they are being built with. Modules that
explicitly set various FILES_ values were using the paths that are only
valid for the older versions of perl. Calculate and set the correct path in
cpan.bbclass and use that in the FILES_ variables so that it'll be correct
for all versions of perl.
Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 39b0c54a5b69e68b9f43900fc5c3fbb6bfcf60a1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=39b0c54a5b69e68b9f43900fc5c3fbb6bfcf60a1
Files:
1
classes/cpan.bbclass
packages/perl/libcompress-zlib-perl_1.42.bb
packages/perl/libdigest-sha1-perl_2.11.bb
packages/perl/libipc-sharelite-perl_0.09.bb
packages/perl/liblocale-gettext-perl_1.05.bb
packages/perl/libmath-bigint-gmp-perl_1.18.bb
packages/perl/libparams-validate-perl_0.86.bb
packages/perl/libversion-perl_0.6701.bb
packages/perl/libxml-parser-perl_2.34.bb
Diffs:
#
# mt diff -r51c79e4e791fae186b878803d80f0abc0bcd6282 -r39b0c54a5b69e68b9f43900fc5c3fbb6bfcf60a1
#
#
#
# patch "classes/cpan.bbclass"
# from [5512037f9dd48046df019b6558d80444e89177ce]
# to [059ed12d7dc02d4badd19c970c172fe198812095]
#
# patch "packages/perl/libcompress-zlib-perl_1.42.bb"
# from [e5fcbc463036abdc0f0483bb03440d3df48728c5]
# to [8059435fecfcccf78252bd8a0e640f84e6a419f7]
#
# patch "packages/perl/libdigest-sha1-perl_2.11.bb"
# from [dd9483f5fb9d930ae07a8112a74e0fe315aa4b95]
# to [fb8d9275312e077461cefaf7703cd0b49980060a]
#
# patch "packages/perl/libipc-sharelite-perl_0.09.bb"
# from [f06d1ce6da33b11394c0958333d7f3272e8db98a]
# to [74f4e7cdfb421ec58d2f495455d3e664996a49a9]
#
# patch "packages/perl/liblocale-gettext-perl_1.05.bb"
# from [125df90313789a6614cc869c58ca920962b2284c]
# to [eeea405c14a1b485b212e98965ae024a2b7398c6]
#
# patch "packages/perl/libmath-bigint-gmp-perl_1.18.bb"
# from [96502a252130dff817754b936a05a6d897eb01f7]
# to [654ec6369ac1af8d022fba221f2129dabfa95f5f]
#
# patch "packages/perl/libparams-validate-perl_0.86.bb"
# from [f8231d3d2a380156bc02ef792818c09ec93381a8]
# to [f3245f148e3482b90a882158eca164e796f12b1e]
#
# patch "packages/perl/libversion-perl_0.6701.bb"
# from [08953d817ff43741f0f3c3a4b3e3fe404702e02e]
# to [35443a59fd66cd712e8f5e9966491180fc603817]
#
# patch "packages/perl/libxml-parser-perl_2.34.bb"
# from [0f3dedb9630a16c7493bf727fae1a7cd2e7d5cec]
# to [85f54f3232917dea46a81a7be5187428c7977571]
#
============================================================
--- classes/cpan.bbclass 5512037f9dd48046df019b6558d80444e89177ce
+++ classes/cpan.bbclass 059ed12d7dc02d4badd19c970c172fe198812095
@@ -31,7 +31,18 @@ def is_new_perl(d):
return "no"
return "yes"
+# Determine where the library directories are
+def perl_get_libdirs(d):
+ import bb
+ libdir = bb.data.getVar('libdir', d, 1)
+ if is_new_perl(d) == "yes":
+ libdirs = libdir + '/perl5'
+ else:
+ libdirs = libdir + '/*/*/perl5'
+ return libdirs
+
IS_NEW_PERL = "${@is_new_perl(d)}"
+PERLLIBDIRS = "${@perl_get_libdirs(d)}"
cpan_do_configure () {
perl Makefile.PL ${EXTRA_CPANFLAGS}
============================================================
--- packages/perl/libcompress-zlib-perl_1.42.bb e5fcbc463036abdc0f0483bb03440d3df48728c5
+++ packages/perl/libcompress-zlib-perl_1.42.bb 8059435fecfcccf78252bd8a0e640f84e6a419f7
@@ -1,7 +1,7 @@ LICENSE = "Artistic|GPL"
DESCRIPTION = "Compress::Zlib - Interface to zlib compression library"
SECTION = "libs"
LICENSE = "Artistic|GPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz"
@@ -9,7 +9,7 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/Compress/Zlib/* \
+ ${PERLLIBDIRS}/auto/Compress/Zlib/.packlist \
+ ${PERLLIBDIRS}/Compress"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Compress/Zlib/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Compress/Zlib/* \
- ${libdir}/perl5/*/*/auto/Compress/Zlib/.packlist \
- ${libdir}/perl5/*/*/Compress"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Compress/Zlib/.debug"
============================================================
--- packages/perl/libdigest-sha1-perl_2.11.bb dd9483f5fb9d930ae07a8112a74e0fe315aa4b95
+++ packages/perl/libdigest-sha1-perl_2.11.bb fb8d9275312e077461cefaf7703cd0b49980060a
@@ -1,7 +1,7 @@ LICENSE = "Artistic|GPL"
DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
SECTION = "libs"
LICENSE = "Artistic|GPL"
-PR = "r7"
+PR = "r8"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz"
@@ -9,7 +9,7 @@ inherit cpan
inherit cpan
+FILES_${PN} += "${PERLLIBDIRS}/auto/Digest/SHA1/* \
+ ${PERLLIBDIRS}/auto/Digest/SHA1/.packlist \
+ ${PERLLIBDIRS}/Digest"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Digest/SHA1/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Digest/SHA1/* \
- ${libdir}/perl5/*/*/auto/Digest/SHA1/.packlist \
- ${libdir}/perl5/*/*/Digest"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Digest/SHA1/.debug"
============================================================
--- packages/perl/libipc-sharelite-perl_0.09.bb f06d1ce6da33b11394c0958333d7f3272e8db98a
+++ packages/perl/libipc-sharelite-perl_0.09.bb 74f4e7cdfb421ec58d2f495455d3e664996a49a9
@@ -1,7 +1,7 @@ LICENSE = "Artistic|GPL"
DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
SECTION = "libs"
LICENSE = "Artistic|GPL"
-PR = "r7"
+PR = "r8"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-${PV}.tar.gz"
@@ -9,7 +9,7 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/IPC/ShareLite/* \
+ ${PERLLIBDIRS}/auto/IPC/ShareLite/.packlist \
+ ${PERLLIBDIRS}/IPC"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/IPC/ShareLite/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/IPC/ShareLite/* \
- ${libdir}/perl5/*/*/auto/IPC/ShareLite/.packlist \
- ${libdir}/perl5/*/*/IPC"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/IPC/ShareLite/.debug"
============================================================
--- packages/perl/liblocale-gettext-perl_1.05.bb 125df90313789a6614cc869c58ca920962b2284c
+++ packages/perl/liblocale-gettext-perl_1.05.bb eeea405c14a1b485b212e98965ae024a2b7398c6
@@ -1,8 +1,8 @@ DEPENDS = "virtual/libintl"
DESCRIPTION = "Locale::gettext - message handling functions"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/libintl"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${PV}.tar.gz"
@@ -10,7 +10,7 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/Locale/gettext/* \
+ ${PERLLIBDIRS}/auto/Locale/gettext/.packlist \
+ ${PERLLIBDIRS}/Locale"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Locale/gettext/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Locale/gettext/* \
- ${libdir}/perl5/*/*/auto/Locale/gettext/.packlist \
- ${libdir}/perl5/*/*/Locale"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Locale/gettext/.debug"
============================================================
--- packages/perl/libmath-bigint-gmp-perl_1.18.bb 96502a252130dff817754b936a05a6d897eb01f7
+++ packages/perl/libmath-bigint-gmp-perl_1.18.bb 654ec6369ac1af8d022fba221f2129dabfa95f5f
@@ -1,9 +1,9 @@ RDEPENDS += "gmp"
DESCRIPTION = "Math::BigInt::GMP - Use the GMP library for Math::BigInt routines"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS += "gmp-native"
RDEPENDS += "gmp"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-${PV}.tar.gz"
@@ -11,7 +11,7 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/Math/BigInt/GMP/* \
+ ${PERLLIBDIRS}/auto/Math/BigInt/GMP/.packlist \
+ ${PERLLIBDIRS}/Math"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Math/BigInt/GMP/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Math/BigInt/GMP/* \
- ${libdir}/perl5/*/*/auto/Math/BigInt/GMP/.packlist \
- ${libdir}/perl5/*/*/Math"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Math/BigInt/GMP/.debug"
============================================================
--- packages/perl/libparams-validate-perl_0.86.bb f8231d3d2a380156bc02ef792818c09ec93381a8
+++ packages/perl/libparams-validate-perl_0.86.bb f3245f148e3482b90a882158eca164e796f12b1e
@@ -1,7 +1,7 @@ LICENSE = "Artistic|GPL"
DESCRIPTION = "Params::Validate - Validate method/function parameters"
SECTION = "libs"
LICENSE = "Artistic|GPL"
-PR = "r7"
+PR = "r8"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-${PV}.tar.gz"
@@ -9,8 +9,8 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/Params/Validate/* \
+ ${PERLLIBDIRS}/auto/Params/Validate/.packlist \
+ ${PERLLIBDIRS}/Params \
+ ${PERLLIBDIRS}/Attribute"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Params/Validate/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Params/Validate/* \
- ${libdir}/perl5/*/*/auto/Params/Validate/.packlist \
- ${libdir}/perl5/*/*/Params \
- ${libdir}/perl5/*/*/Attribute"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Params/Validate/.debug"
============================================================
--- packages/perl/libversion-perl_0.6701.bb 08953d817ff43741f0f3c3a4b3e3fe404702e02e
+++ packages/perl/libversion-perl_0.6701.bb 35443a59fd66cd712e8f5e9966491180fc603817
@@ -1,7 +1,7 @@ LICENSE = "Artistic|GPL"
DESCRIPTION = "version - Perl extension for Version Objects"
SECTION = "libs"
LICENSE = "Artistic|GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-${PV}.tar.gz"
@@ -9,8 +9,8 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/version/vxs/* \
+ ${PERLLIBDIRS}/auto/version/.packlist \
+ ${PERLLIBDIRS}/version/* \
+ ${PERLLIBDIRS}/version.pm"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/version/vxs/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/version/vxs/* \
- ${libdir}/perl5/*/*/auto/version/.packlist \
- ${libdir}/perl5/*/*/version/* \
- ${libdir}/perl5/*/*/version.pm"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/version/vxs/.debug"
============================================================
--- packages/perl/libxml-parser-perl_2.34.bb 0f3dedb9630a16c7493bf727fae1a7cd2e7d5cec
+++ packages/perl/libxml-parser-perl_2.34.bb 85f54f3232917dea46a81a7be5187428c7977571
@@ -1,6 +1,6 @@ LICENSE = "Artistic"
SECTION = "libs"
LICENSE = "Artistic"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
@@ -8,7 +8,7 @@ inherit cpan
inherit cpan
+FILES_${PN} = "${PERLLIBDIRS}/auto/XML/Parser/Expat/* \
+ ${PERLLIBDIRS}/auto/XML/Parser/.packlist \
+ ${PERLLIBDIRS}/XML"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/XML/Parser/Expat/.debug"
-FILES_${PN} = "${libdir}/perl5/*/*/auto/XML/Parser/Expat/* \
- ${libdir}/perl5/*/*/auto/XML/Parser/.packlist \
- ${libdir}/perl5/*/*/XML"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/XML/Parser/Expat/.debug"
More information about the Openembedded-commits
mailing list