From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 1412A60232 for ; Thu, 15 Jan 2015 16:40:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t0FGeh0X026810; Thu, 15 Jan 2015 16:40:43 GMT Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KHA6Iq4bZhJ2; Thu, 15 Jan 2015 16:40:43 +0000 (GMT) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t0FGeTSF026805 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 15 Jan 2015 16:40:40 GMT Message-ID: <1421340029.18703.0.camel@linuxfoundation.org> From: Richard Purdie To: Daniel Dragomir Date: Thu, 15 Jan 2015 16:40:29 +0000 In-Reply-To: <1421339471-11486-1-git-send-email-daniel.dragomir@windriver.com> References: <1421339471-11486-1-git-send-email-daniel.dragomir@windriver.com> X-Mailer: Evolution 3.12.7-0ubuntu1 Mime-Version: 1.0 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH] gcc-runtime: Remove libgfortran data from receipe X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jan 2015 16:40:57 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Thu, 2015-01-15 at 18:31 +0200, Daniel Dragomir wrote: > Remove libgfortran packages from PACKAGES list and skip them at compiling > and installing as long as libgfortran has separate receipe since commit > > 5bde5d9b39ea67f19a1a6aedd0c08c6cfedcbe5f > gcc: Allow fortran to build successfully in 4.8 > > Otherwise, when fortran support will be enabled in the compiler, both > lingfortran and gcc-runtime receipes will create the same files and will > try to install them. This will cause errors: > > ERROR: The recipe libgfortran is trying to install files into a shared > area when those files already exist. Those files and their manifest > location are: ... > Please verify which recipe should provide the above files. > > Signed-off-by: Daniel Dragomir > --- > meta/recipes-devtools/gcc/gcc-runtime.inc | 41 ++++++++++++------------------- > 1 file changed, 16 insertions(+), 25 deletions(-) > > diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc > index 167869e..c3b4a46 100644 > --- a/meta/recipes-devtools/gcc/gcc-runtime.inc > +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc > @@ -22,28 +22,34 @@ do_configure () { > target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` > hardlinkdir ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget ${B} > for d in libgcc ${RUNTIMETARGET}; do > - echo "Configuring $d" > - rm -rf ${B}/$target/$d/ > - mkdir -p ${B}/$target/$d/ > - cd ${B}/$target/$d/ > - chmod a+x ${S}/$d/configure > - ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} > + if [ "$d" != "libgfortran" ]; then Why would libgfortran be in RUNTIMETARGET? Surely it would be better just to ensure it isn't rather than ignore it? Cheers, Richard > + echo "Configuring $d" > + rm -rf ${B}/$target/$d/ > + mkdir -p ${B}/$target/$d/ > + cd ${B}/$target/$d/ > + chmod a+x ${S}/$d/configure > + ${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} > + fi > done > } > > do_compile () { > target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` > for d in libgcc ${RUNTIMETARGET}; do > - cd ${B}/$target/$d/ > - oe_runmake MULTIBUILDTOP=${B}/$target/$d/ > + if [ "$d" != "libgfortran" ]; then > + cd ${B}/$target/$d/ > + oe_runmake MULTIBUILDTOP=${B}/$target/$d/ > + fi > done > } > > do_install () { > target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` > for d in ${RUNTIMETARGET}; do > - cd ${B}/$target/$d/ > - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install > + if [ "$d" != "libgfortran" ]; then > + cd ${B}/$target/$d/ > + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install > + fi > done > rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir > rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir > @@ -76,9 +82,6 @@ PACKAGES = "\ > libssp \ > libssp-dev \ > libssp-staticdev \ > - libgfortran \ > - libgfortran-dev \ > - libgfortran-staticdev \ > libmudflap \ > libmudflap-dev \ > libmudflap-staticdev \ > @@ -131,18 +134,6 @@ FILES_libssp-dev = "\ > " > FILES_libssp-staticdev = "${libdir}/libssp*.a" > > -FILES_libgfortran = "${libdir}/libgfortran.so.*" > -FILES_libgfortran-dev = "\ > - ${libdir}/libgfortran*.so \ > - ${libdir}/libgfortran.spec \ > - ${libdir}/libgfortran.la \ > - ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \ > - ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \ > -" > -FILES_libgfortran-staticdev = "${libdir}/libgfortran.a" > - > -INSANE_SKIP_${MLPREFIX}libgfortran-dev = "staticdev" > - > FILES_libquadmath = "${libdir}/libquadmath*.so.*" > FILES_libquadmath-dev = "\ > ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/quadmath* \ > -- > 1.8.1.4 >