From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SoGMn-00065B-OH for openembedded-core@lists.openembedded.org; Mon, 09 Jul 2012 17:59:18 +0200 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 09 Jul 2012 08:48:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="190292919" Received: from unknown (HELO swold-mobl.bigsur.com) ([10.255.12.157]) by fmsmga002.fm.intel.com with ESMTP; 09 Jul 2012 08:48:02 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Mon, 9 Jul 2012 08:47:41 -0700 Message-Id: <5ab3bc4833c2674014b50a93f5ca323d8de5aedd.1341802889.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 27/41] libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 15:59:18 -0000 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 -- 1.7.7.6