diff options
4 files changed, 11 insertions, 55 deletions
diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc deleted file mode 100644 index 9684d1f993..0000000000 --- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPLv3" -HOMEPAGE = "http://www.gnu.org/software/autoconf-archive/" -SECTION = "devel" - -DEPENDS += "m4-native" -DEPENDS_class-native = "m4-native gnu-config-native" -DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - -RDEPENDS_${PN} = "m4 gnu-config gnome-common" -RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" -RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" - -inherit autotools diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch deleted file mode 100644 index 2aa788bf9f..0000000000 --- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch +++ /dev/null @@ -1,23 +0,0 @@ -Delete two m4files ax_code_coverage.m4 and ax_check_enable_debug.m4 -to avoid installing conflicts. These two files can be installed by -gnome-common from oe-core, even if the files in gnmoe-common is -copied from autoconf-archive(the reason is that the old version -autoconf-archive don't provide the two files). -After upgrading to the new version, we need to drop them in meta-oe -and then set rdepends to gnome-common(oe-core) - -Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> - -Index: a/configure.ac -=================================================================== ---- a/configure.ac 2016-09-16 06:00:00.000000000 +0800 -+++ b/configure.ac 2017-04-18 17:43:05.946290554 +0800 -@@ -19,7 +19,7 @@ - - AC_PROG_SED - --M4FILES="m4_esyscmd([echo -n m4/*.m4])" -+M4FILES="m4_esyscmd([echo -n m4/*.m4 | sed -e 's:m4/ax_code_coverage.m4 ::g'|sed -e 's:m4/ax_check_enable_debug.m4 ::g'])" - AC_SUBST([M4FILES]) - - TEXIFILES="m4_esyscmd([cd m4 && echo -n *.m4 | sed -e 's/\.m4/.texi/g'])" diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb deleted file mode 100644 index 561b57b4fc..0000000000 --- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb +++ /dev/null @@ -1,17 +0,0 @@ -require autoconf-archive.inc - - -PARALLEL_MAKE = "" - -LICENSE = "GPLv2 & GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" -SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82" - -SRC_URI += "\ - file://delete-some-m4-files.patch \ -" - -EXTRA_OECONF += "ac_cv_path_M4=m4" -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb index 06f3bb34cf..b8b9ef1222 100644 --- a/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb +++ b/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb @@ -17,4 +17,15 @@ DEPENDS = "" FILES_${PN} += "${datadir}/aclocal" FILES_${PN}-dev = "" +# ax_code_coverage.m4 and ax_check_enable_debug.m4 are in gnome-common only +# because older versions of autoconf-archive didn't have them yet. Now they +# are in autoconf-archive from OE-core. We depend on that below to ensure +# that recipes which only depend on gnome-common still get them. +do_install_append () { + rm -f ${D}${datadir}/aclocal/ax_code_coverage.m4 + rm -f ${D}${datadir}/aclocal/ax_check_enable_debug.m4 +} +RDEPENDS_${PN} += "autoconf-archive" +DEPENDS_append_class-native = " autoconf-archive-native" + BBCLASSEXTEND = "native" |