diff options
author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2017-04-19 14:28:35 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-24 11:00:50 +0200 |
commit | 449030b1b920a0ee12a63e2655744db559303778 (patch) | |
tree | edacb337e4f7b7047396e4dd8c38418851620d6c /meta-oe/recipes-devtools | |
parent | 7308d33131d0ee55274514d5ef8800546b27ca25 (diff) | |
download | meta-openembedded-449030b1b920a0ee12a63e2655744db559303778.tar.gz |
autoconf-archive: drop m4files confliction with gnome-common
Delete the conflicting m4files with gnome-common to avoid the confliction,
and the two m4 files will be installed by gnome-common that comes from
oe-core, then set rdepends to gnome-common.
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 779115af5..9684d1f99 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" | |||
6 | DEPENDS_class-native = "m4-native gnu-config-native" | 6 | DEPENDS_class-native = "m4-native gnu-config-native" |
7 | DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" | 7 | DEPENDS_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" |
8 | 8 | ||
9 | RDEPENDS_${PN} = "m4 gnu-config" | 9 | RDEPENDS_${PN} = "m4 gnu-config gnome-common" |
10 | RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" | 10 | RDEPENDS_${PN}_class-native = "m4-native gnu-config-native" |
11 | RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" | 11 | RDEPENDS_${PN}_class-nativesdk = "m4-nativesdk gnu-config-nativesdk" |
12 | 12 | ||
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 000000000..2aa788bf9 --- /dev/null +++ b/meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Delete two m4files ax_code_coverage.m4 and ax_check_enable_debug.m4 | ||
2 | to avoid installing conflicts. These two files can be installed by | ||
3 | gnome-common from oe-core, even if the files in gnmoe-common is | ||
4 | copied from autoconf-archive(the reason is that the old version | ||
5 | autoconf-archive don't provide the two files). | ||
6 | After upgrading to the new version, we need to drop them in meta-oe | ||
7 | and then set rdepends to gnome-common(oe-core) | ||
8 | |||
9 | Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> | ||
10 | |||
11 | Index: a/configure.ac | ||
12 | =================================================================== | ||
13 | --- a/configure.ac 2016-09-16 06:00:00.000000000 +0800 | ||
14 | +++ b/configure.ac 2017-04-18 17:43:05.946290554 +0800 | ||
15 | @@ -19,7 +19,7 @@ | ||
16 | |||
17 | AC_PROG_SED | ||
18 | |||
19 | -M4FILES="m4_esyscmd([echo -n m4/*.m4])" | ||
20 | +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'])" | ||
21 | AC_SUBST([M4FILES]) | ||
22 | |||
23 | 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 0a1a771d1..561b57b4f 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" | |||
9 | SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" | 9 | SRC_URI[md5sum] = "bf19d4cddce260b3c3e1d51d42509071" |
10 | SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82" | 10 | SRC_URI[sha256sum] = "e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82" |
11 | 11 | ||
12 | SRC_URI += "\ | ||
13 | file://delete-some-m4-files.patch \ | ||
14 | " | ||
15 | |||
12 | EXTRA_OECONF += "ac_cv_path_M4=m4" | 16 | EXTRA_OECONF += "ac_cv_path_M4=m4" |
13 | BBCLASSEXTEND = "native nativesdk" | 17 | BBCLASSEXTEND = "native nativesdk" |