From patchwork Mon Jul 9 15:47:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 27/41] libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc Date: Mon, 09 Jul 2012 15:47:41 -0000 From: Saul Wold X-Patchwork-Id: 31473 Message-Id: <5ab3bc4833c2674014b50a93f5ca323d8de5aedd.1341802889.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Matthew McClintock MakeMaker has a bug where it does not propagate CC/LD/etc information down to subproject it generates Makefiles for... this recipe has has an Expat subproject which has issues building if we are using sstate-cache and it will reference the old sysroots and be unable to build properly. There is an upstream MakeMaker bug for this issue but we can work around it by fixing up the Makefiles for now See: https://rt.cpan.org/Public/Bug/Display.html?id=28632 Signed-off-by: Matthew McClintock --- .../perl/libxml-parser-perl_2.41.bb | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb index be41578..33b4d83 100644 --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e DEPENDS += "expat expat-native" -PR = "r2" +PR = "r3" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e" @@ -13,10 +13,17 @@ SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740 S = "${WORKDIR}/XML-Parser-${PV}" -EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR} CC=${CC} LD=${LD} FULL_AR=${AR}" inherit cpan +# fix up sub MakeMaker project as arguments don't get propagated though +# see https://rt.cpan.org/Public/Bug/Display.html?id=28632 +do_configure_append() { + sed 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' -i Makefile Expat/Makefile + sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile +} + do_compile() { export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" cpan_do_compile