CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

autoconf-archive: drop m4files confliction with gnome-common

Browse Source 
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>
This commit is contained in:
Zhixiong Chi 2017-04-19 14:28:35 +08:00 committed by Martin Jansa
parent 7308d33131
commit 449030b1b9
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive.inc
View File

@ -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"

23
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive/delete-some-m4-files.patch Normal file
View File

@ -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'])"

4
meta-oe/recipes-devtools/autoconf-archive/autoconf-archive_2016.09.16.bb
View File

@ -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"