diff options
author | Jamie Lenehan <lenehan@twibble.org> | 2006-10-03 20:53:58 +0000 |
---|---|---|
committer | Jamie Lenehan <lenehan@twibble.org> | 2006-10-03 20:53:58 +0000 |
commit | ec3923063f9213dc793141bf6dfb6ddcfbfd5652 (patch) | |
tree | 336cee37c3f01fdaadec30a809c920182ed4cb75 | |
parent | d2b1072b72f80f7d9168c68afcc5f0dc8b4ee8e8 (diff) |
perl: Another sh3/sh4 shared library fix. Modules build built with
cpan.bbclass were being linked using ld instead of gcc, which often
breaks on sh. Override the LD settings so any cpan modules that
compile c/c++ code use gcc to link. Bump the PR on the effected
modules.
-rw-r--r-- | classes/cpan.bbclass | 7 | ||||
-rw-r--r-- | packages/perl/libcompress-zlib-perl_1.42.bb | 2 | ||||
-rw-r--r-- | packages/perl/libdigest-sha1-perl_2.11.bb | 2 | ||||
-rw-r--r-- | packages/perl/libipc-sharelite-perl_0.09.bb | 2 | ||||
-rw-r--r-- | packages/perl/liblocale-gettext-perl_1.05.bb | 2 | ||||
-rw-r--r-- | packages/perl/libparams-validate-perl_0.86.bb | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 0b90e754df..f883867a80 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -17,7 +17,12 @@ cpan_do_configure () { } cpan_do_compile () { - oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" + # You must use gcc to link on sh + OPTIONS="" + if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi + oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" $OPTIONS } cpan_do_install () { diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index dfbfdb5633..0c8dd3c612 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE = "Artistic|GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-1.42.tar.gz" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index 9d40110653..ea79dc4e10 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm" SECTION = "libs" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE = "Artistic|GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz" diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index 39808423a4..75f4533035 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -2,7 +2,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory" SECTION = "libs" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE = "Artistic|GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-0.09.tar.gz" diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb index 0f98e9bde0..c26755d5d9 100644 --- a/packages/perl/liblocale-gettext-perl_1.05.bb +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -3,7 +3,7 @@ SECTION = "libs" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE = "Artistic|GPL" DEPENDS = "virtual/libintl" -PR = "r1" +PR = "r2" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index 55bbe54d0e..30ba19fb6d 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters" SECTION = "libs" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE = "Artistic|GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-0.86.tar.gz" |