The -symlinks packages don't really add any value if we're using update-alternatives. Drop it, leaving an RPROVIDES in case anyone thought they needed it still.
Signed-off-by: Mark Hatle <mark.ha...@windriver.com> --- meta/recipes-devtools/gcc/gcc-target.inc | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index ee41d3f..426be15 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -10,12 +10,12 @@ EXTRA_OECONF_PATHS = " \ ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR} -I${B}/gcc/include/ " PACKAGES = "\ - ${PN} ${PN}-plugins ${PN}-symlinks \ - g++ g++-symlinks \ - cpp cpp-symlinks \ - g77 g77-symlinks \ - gfortran gfortran-symlinks \ - gcov gcov-symlinks \ + ${PN} ${PN}-plugins \ + g++ \ + cpp \ + g77 \ + gfortran \ + gcov \ ${PN}-plugin-dev \ ${PN}-doc \ ${PN}-dev \ @@ -36,6 +36,8 @@ FILES_${PN} = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \ " INSANE_SKIP_${PN} += "dev-so" +RPROVIDES_${PN} += "${PN}-symlinks" +RREPLACES_${PN} += "${PN}-symlinks" FILES_${PN}-dbg += "\ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/.debug/ \ @@ -50,8 +52,6 @@ FILES_${PN}-plugin-dev = "\ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \ " -FILES_${PN}-symlinks = "" -ALLOW_EMPTY_${PN}-symlinks = "1" FILES_${PN}-plugins = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \ @@ -62,33 +62,33 @@ FILES_g77 = "\ ${bindir}/${TARGET_PREFIX}g77 \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \ " -FILES_g77-symlinks = "" -ALLOW_EMPTY_g77-symlinks = "1" +RPROVIDES_g77 += "g77-symlinks" +RREPLACES_g77 += "g77-symlinks" FILES_gfortran = "\ ${bindir}/${TARGET_PREFIX}gfortran \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \ " -FILES_gfortran-symlinks = "" -ALLOW_EMPTY_gfortran-symlinks = "1" +RPROVIDES_gfortran += "gfortran-symlinks" +RREPLACES_gfortran += "gfortran-symlinks" FILES_cpp = "\ ${bindir}/${TARGET_PREFIX}cpp \ ${base_libdir}/cpp \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" -FILES_cpp-symlinks = "" -ALLOW_EMPTY_cpp-symlinks = "1" +RPROVIDES_cpp += "cpp-symlinks" +RREPLACES_cpp += "cpp-symlinks" FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" -FILES_gcov-symlinks = "" -ALLOW_EMPTY_gconv-symlinks = "1" +RPROVIDES_gcov += "gcov-symlinks" +RREPLACES_gcov += "gcov-symlinks" FILES_g++ = "\ ${bindir}/${TARGET_PREFIX}g++ \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ " -FILES_g++-symlinks = "" -ALLOW_EMPTY_g++-symlinks = "1" +RPROVIDES_g++ += "g++-symlinks" +RREPLACES_g++ += "g++-symlinks" FILES_${PN}-doc = "\ ${infodir} \ @@ -137,12 +137,12 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-symlinks = "cc gcc" -ALTERNATIVE_g77-symlinks = "${@['', 'g77 f77']['f77' in d.getVar('FORTRAN', True)]}" -ALTERNATIVE_gfortran-symlinks = "${@['', 'gfortran f95']['fortran' in d.getVar('FORTRAN', True)]}" -ALTERNATIVE_cpp-symlinks = "cpp" -ALTERNATIVE_gcov-symlinks = "gcov" -ALTERNATIVE_g++-symlinks = "c++ g++" +ALTERNATIVE_${PN} = "cc gcc" +ALTERNATIVE_g77 = "${@['', 'g77 f77']['f77' in d.getVar('FORTRAN', True)]}" +ALTERNATIVE_gfortran = "${@['', 'gfortran f95']['fortran' in d.getVar('FORTRAN', True)]}" +ALTERNATIVE_cpp = "cpp" +ALTERNATIVE_gcov = "gcov" +ALTERNATIVE_g++ = "c++ g++" ALTERNATIVE_LINK_NAME[cc] = "${bindir}/cc" ALTERNATIVE_TARGET[cc] = "${bindir}/${TARGET_PREFIX}gcc" -- 1.8.1.2.545.g2f19ada _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core