diff options
Diffstat (limited to 'meta-oe/recipes-devtools')
3 files changed, 28 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc index 779115af5d..9684d1f993 100644 --- a/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc @@ -6,7 +6,7 @@ DEPENDS += "m4-native" DEPENDS_class-native = "m4-native gnu-config-native" DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" -RDEPENDS_${PN} = "m4 gnu-config" +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" 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 new file mode 100644 index 0000000000..2aa788bf9f --- /dev/null +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch @@ -0,0 +1,23 @@ +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 index 0a1a771d15..561b57b4fc 100644 --- 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 @@ -9,5 +9,9 @@ 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" |