From 84470181159bb115156f64726d4342148d091998 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 26 Apr 2007 22:19:39 +0000 Subject: insane.bbclass: RPATH check was always true due to scanelf output including the file path. --- classes/insane.bbclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c424a573d3..d07b181dbd 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -21,7 +21,8 @@ # We play a special package function inherit package -PACKAGE_DEPENDS += "pax-utils-native chrpath-native" +PACKAGE_DEPENDS += "pax-utils-native" +#PACKAGE_DEPENDS += chrpath-native" PACKAGEFUNCS += " do_package_qa " @@ -202,19 +203,25 @@ def package_qa_check_rpath(file,name,d): """ import bb, os scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf') + #chrpath = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'chrpath') bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work" bad_dir_test = bb.data.getVar('TMPDIR', d, True) if not os.path.exists(scanelf): - bb.fatal("Can not check RPATH scanelf not found") + bb.fatal("Can not check RPATH, scanelf (part of pax-utils-native) not found") + #if not os.path.exists(chrpath): + # bb.fatal("Can not fix RPATH, chrpath (part of chrpath-native) not found") if not bad_dir in bb.data.getVar('WORKDIR', d, True): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") - output = os.popen("%s -Byr %s" % (scanelf,file)) + bb.note("%s -F%%r#F %s" % (scanelf,file)) + output = os.popen("%s -F%%r#F %s" % (scanelf,file)) txt = output.readline().split() for line in txt: if bad_dir_test in line: package_qa_write_error( 1, name, file, d) bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) + #bb.note("Fixing RPATH for you in %s" % file) + #os.popen("%s -r /lib %s" % (chrpath,file)) return False return True -- cgit v1.2.3 From 5da8ac500c38c2a0f7c2d7f104061be482c7b7d2 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 26 Apr 2007 23:24:09 +0000 Subject: insane.bbclass: Commented out scanelf format debugging. --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index d07b181dbd..7454957e5b 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -213,7 +213,7 @@ def package_qa_check_rpath(file,name,d): if not bad_dir in bb.data.getVar('WORKDIR', d, True): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") - bb.note("%s -F%%r#F %s" % (scanelf,file)) + #bb.note("%s -F%%r#F %s" % (scanelf,file)) output = os.popen("%s -F%%r#F %s" % (scanelf,file)) txt = output.readline().split() for line in txt: -- cgit v1.2.3 From 7e8aca6f9c3cedf040cd58e4f565361bfcded9f9 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 27 Apr 2007 00:12:23 +0000 Subject: insane.bbclass: Re-add -B to scanelf to make it correctly check single RPATH occurences. --- classes/insane.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 7454957e5b..30b164b734 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -213,10 +213,12 @@ def package_qa_check_rpath(file,name,d): if not bad_dir in bb.data.getVar('WORKDIR', d, True): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") - #bb.note("%s -F%%r#F %s" % (scanelf,file)) - output = os.popen("%s -F%%r#F %s" % (scanelf,file)) + #bb.note("%s -B -F%%r#F %s" % (scanelf,file)) + output = os.popen("%s -B -F%%r#F %s" % (scanelf,file)) txt = output.readline().split() + #bb.note("???%s???" % bad_dir_test) for line in txt: + #bb.note("===%s===" % line) if bad_dir_test in line: package_qa_write_error( 1, name, file, d) bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) -- cgit v1.2.3 From f90b1322d610a95421df8e17eb91f384fd2e057a Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 27 Apr 2007 00:50:50 +0000 Subject: perl 5.8.8: Fixes to be able to build under uclibc. --- packages/perl/perl_5.8.8.bb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index d4124cda9a..486c999eaa 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r6" +PR = "r7" # Major part of version PVM = "5.8" @@ -59,14 +59,15 @@ do_configure() { cat $i >> config.sh-${TARGET_ARCH}-${TARGET_OS} done - # uclibc not checked with this version yet - # uclicb fixups - #for i in config.sh-*-linux; do - # a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`" - # newfile="`echo $i|sed -e 's,-linux$,-linux-uclibc,g'`" - # cat $i | sed -e "s,${a}-linux,${a}-linux-uclibc,g; \ - # s,d_sockatmark='define',d_sockatmark='undef',g;" > $newfile - #done + # Fixups for uclibc + if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + sed -i -e "s,\(d_crypt_r=\)'define',\1'undef',g" \ + -e "s,\(d_getnetbyname_r=\)'define',\1'undef',g" \ + -e "s,\(d_getnetbyaddr_r=\)'define',\1'undef',g" \ + -e "s,\(d_getnetent_r=\)'define',\1'undef',g" \ + -e "s,\(d_sockatmark=\)'define',\1'undef',g" \ + config.sh-${TARGET_ARCH}-${TARGET_OS} + fi # Update some paths in the configuration sed -i -e 's,@DESTDIR@,${D},g' \ -- cgit v1.2.3 From e0a22d5d7667fba263a867bc49147c28802e0f62 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 27 Apr 2007 01:46:30 +0000 Subject: libpcre: Fix SRC_URI --- packages/libpcre/libpcre_4.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_4.4.bb index 7b841d0cfc..3eb25ef485 100644 --- a/packages/libpcre/libpcre_4.4.bb +++ b/packages/libpcre/libpcre_4.4.bb @@ -5,9 +5,9 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r6" +PR = "r7" LICENSE = "BSD" -SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" PROVIDES = "pcre" -- cgit v1.2.3 From bf3453c3ea3858a857d44c5cbc4f4a48069652da Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 27 Apr 2007 02:06:22 +0000 Subject: 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. --- classes/cpan.bbclass | 11 +++++++++++ packages/perl/libcompress-zlib-perl_1.42.bb | 10 +++++----- packages/perl/libdigest-sha1-perl_2.11.bb | 10 +++++----- packages/perl/libipc-sharelite-perl_0.09.bb | 10 +++++----- packages/perl/liblocale-gettext-perl_1.05.bb | 10 +++++----- packages/perl/libmath-bigint-gmp-perl_1.18.bb | 10 +++++----- packages/perl/libparams-validate-perl_0.86.bb | 12 ++++++------ packages/perl/libversion-perl_0.6701.bb | 12 ++++++------ packages/perl/libxml-parser-perl_2.34.bb | 10 +++++----- 9 files changed, 53 insertions(+), 42 deletions(-) diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 9915bf6f67..52430560ea 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -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} diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index 8631e1da02..19f60f801b 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -1,7 +1,7 @@ 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 @@ S = "${WORKDIR}/Compress-Zlib-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/Compress/Zlib/* \ + ${PERLLIBDIRS}/auto/Compress/Zlib/.packlist \ + ${PERLLIBDIRS}/Compress" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Compress/Zlib/.debug" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index 5e482164bb..178b463d38 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -1,7 +1,7 @@ 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 @@ S = "${WORKDIR}/Digest-SHA1-${PV}" inherit cpan -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" +FILES_${PN} += "${PERLLIBDIRS}/auto/Digest/SHA1/* \ + ${PERLLIBDIRS}/auto/Digest/SHA1/.packlist \ + ${PERLLIBDIRS}/Digest" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Digest/SHA1/.debug" diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index cd7c19fb2a..acb280b111 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -1,7 +1,7 @@ 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 @@ S = "${WORKDIR}/IPC-ShareLite-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/IPC/ShareLite/* \ + ${PERLLIBDIRS}/auto/IPC/ShareLite/.packlist \ + ${PERLLIBDIRS}/IPC" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/IPC/ShareLite/.debug" diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb index b4fe0b2f2c..177ad02e85 100644 --- a/packages/perl/liblocale-gettext-perl_1.05.bb +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -2,7 +2,7 @@ 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 @@ S = "${WORKDIR}/gettext-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/Locale/gettext/* \ + ${PERLLIBDIRS}/auto/Locale/gettext/.packlist \ + ${PERLLIBDIRS}/Locale" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Locale/gettext/.debug" diff --git a/packages/perl/libmath-bigint-gmp-perl_1.18.bb b/packages/perl/libmath-bigint-gmp-perl_1.18.bb index d850ab71f1..53a83da08b 100644 --- a/packages/perl/libmath-bigint-gmp-perl_1.18.bb +++ b/packages/perl/libmath-bigint-gmp-perl_1.18.bb @@ -3,7 +3,7 @@ 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 @@ S = "${WORKDIR}/Math-BigInt-GMP-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/Math/BigInt/GMP/* \ + ${PERLLIBDIRS}/auto/Math/BigInt/GMP/.packlist \ + ${PERLLIBDIRS}/Math" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Math/BigInt/GMP/.debug" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index 8b1f9583ed..c102b6df1b 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -1,7 +1,7 @@ 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 @@ S = "${WORKDIR}/Params-Validate-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/Params/Validate/* \ + ${PERLLIBDIRS}/auto/Params/Validate/.packlist \ + ${PERLLIBDIRS}/Params \ + ${PERLLIBDIRS}/Attribute" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Params/Validate/.debug" diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb index b78397e9e6..b4f398f040 100644 --- a/packages/perl/libversion-perl_0.6701.bb +++ b/packages/perl/libversion-perl_0.6701.bb @@ -1,7 +1,7 @@ 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 @@ S = "${WORKDIR}/version-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/version/vxs/* \ + ${PERLLIBDIRS}/auto/version/.packlist \ + ${PERLLIBDIRS}/version/* \ + ${PERLLIBDIRS}/version.pm" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/version/vxs/.debug" diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb index 25fec1e093..f6cbb4efbe 100644 --- a/packages/perl/libxml-parser-perl_2.34.bb +++ b/packages/perl/libxml-parser-perl_2.34.bb @@ -1,6 +1,6 @@ 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 @@ S = "${WORKDIR}/XML-Parser-${PV}" inherit cpan -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" +FILES_${PN} = "${PERLLIBDIRS}/auto/XML/Parser/Expat/* \ + ${PERLLIBDIRS}/auto/XML/Parser/.packlist \ + ${PERLLIBDIRS}/XML" +FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/XML/Parser/Expat/.debug" -- cgit v1.2.3 From 3cc9d5463dac0412d5591b506e308f3e9cde0494 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 27 Apr 2007 02:22:26 +0000 Subject: cpan: Use CCLD for the linking instead of ${TARGET_SYS}-gcc. Without this native packages break because -gcc doesn't exist, just gcc. CCLD gets us the correct CC to be used for linking in both cases, so we use that. --- classes/cpan.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 52430560ea..00709f7e18 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -68,7 +68,7 @@ cpan_do_configure () { cpan_do_compile () { if [ "${IS_NEW_PERL}" = "yes" ]; then - oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD=${TARGET_SYS}-gcc + oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}" else # You must use gcc to link on sh OPTIONS="" -- cgit v1.2.3