diff options
| author |   Patrick Ohly <patrick.ohly@intel.com> | 2017-07-28 16:02:59 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 15:22:57 +0200 |
| commit | ec1781e98fd49733c60f9c162b15eaf50c2e46dd (patch) | |
| tree | c37742bcc5ca2690faed31e2ff107a1ff597b3ad /meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch | |
| parent | d802d780321f47fb691626286d60f3e7a2f70057 (diff) | |
| download | meta-openembedded-contrib-ec1781e98fd49733c60f9c162b15eaf50c2e46dd.tar.gz | |
autoconf-archive: move from meta-oe to OE-core
This complements the corresponding patch in OE-core.
gnome-common is affected and must be modified together with the move
because of the conflict over who provides ax_code_coverage.m4 and
ax_check_enable_debug.m4. They now come from autoconf-archive in
OE-core.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch | 23 |
1 files changed, 0 insertions, 23 deletions
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'])" |