icu: merge .inc into main recipe
PATCH 1/2 icu: merge .inc into main recipe
Both parts are rather convoluted, so it is better to have them in a single file.
--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.inc
meta/recipes-support/icu/icu.inc deleted +0 -84
@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"
meta/recipes-support/icu/icu_67.1.bb +84 -1
88 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH 2/2 icu: make filtered data generation optional, serial and off by default
icu data generation was found to be racy, and causig AB failures; making it serial and leaving it on is not an option as it regresses to several minutes.
The specific bug is that rules.mk has:
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/gencnval -s . -d ./out/build/icudt66l mappings/convrtrs.txt
which creates a file and numerous rules like
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/genrb -s ./misc -d ./out/build/icudt67l -i ./out/build/icudt67l -k -q numberingSystems.txt
which quietly read it. There is no prerequisite for the former to complete first.
The race is extra complicated to fix as rules.mk is itself generated through a custom in-tree python tool.
--- meta/recipes-support/icu/icu_67.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-support/icu/icu_67.1.bb +5 -1
@@ -120,7 +120,11 @@ UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" +PACKAGECONFIG ?= "" +PACKAGECONFIG[make-icudata] = ",,," + do_make_icudata_class-target () { + ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} cd ${S} rm -rf data cp -a ${WORKDIR}/data .
@@ -135,7 +139,7 @@ do_make_icudata_class-target () { LDFLAGS='${BUILD_LDFLAGS}' \ ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ ./runConfigureICU Linux --with-data-packaging=archive - oe_runmake ${PARALLEL_MAKE} + oe_runmake install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat }
Signature · 1 line
2.27.0
Re: [OE-core] [PATCH 2/2] icu: make filtered data generation optional, serial and off by default
Quoted 27 lines · Alexander Kanavin
icu data generation was found to be racy, and causig AB failures; making it serial and leaving it on is not an option as it regresses to several minutes.
The specific bug is that rules.mk has:
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/gencnval -s . -d ./out/build/icudt66l
mappings/convrtrs.txtwhich creates a file and numerous rules like
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/genrb -s ./misc -d ./out/build/icudt67l -i ./out/build/icudt67l -k -q numberingSystems.txt
which quietly read it. There is no prerequisite for the former to complete first.
The race is extra complicated to fix as rules.mk is itself generated through a custom in-tree python tool.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu_67.1.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)meta/recipes-support/icu/icu_67.1.bb +0
-0
meta/recipes-support/icu/icu_67.1.bb UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" · line 124
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0@@ -120,7 +120,11 @@ UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" +PACKAGECONFIG ?= "" +PACKAGECONFIG[make-icudata] = ",,,"
maybe calling it custom-icudata is appropriate. This option perhaps should be enabled by default with a minimum filter, which is to enable en_US perhaps, it helps integrate the external build processes that is in place where systems depend on icudata and don't want all 20M of it in image. It would be good for us to offer a tested way to custom build this data.
but I am ok to live with this workaround until perhaps this issue is fixed upstream amicably.
Quoted 19 lines
meta/recipes-support/icu/icu_67.1.bb +3
-1+ do_make_icudata_class-target () { + ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} cd ${S} rm -rf data cp -a ${WORKDIR}/data .@@ -135,7 +139,7 @@ do_make_icudata_class-target () { LDFLAGS='${BUILD_LDFLAGS}' \ ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ ./runConfigureICU Linux --with-data-packaging=archive - oe_runmake ${PARALLEL_MAKE} + oe_runmake install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat }
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
I think you may have to recreate them by hand.
Alex
Quoted 238 lines · Steve Sakoman
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 2 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a
single file.
Review
Quoted 9 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.inc(quoted diff) +0
-0b/meta/recipes-support/icu/icu.inc
meta/recipes-support/icu/icu.inc line 2
Quoted 7 lines
deleted file mode 100644
index 6d9728903d..0000000000meta/recipes-support/icu/icu.inc deleted +0
-2@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is amature, \
meta/recipes-support/icu/icu.inc line 4
Quoted 2 lines
meta/recipes-support/icu/icu.inc deleted +0
-2-portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), givingapplications the \
Quoted 12 lines
meta/recipes-support/icu/icu.inc deleted +0
-12-same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"meta/recipes-support/icu/icu.inc
Quoted 10 lines
meta/recipes-support/icu/icu.inc deleted +0
-10- -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its--with-cross-build option when
meta/recipes-support/icu/icu.inc line 27
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# cross-compiling. Taken the situation that different builds may sharea common sstate-cache
meta/recipes-support/icu/icu.inc
Quoted 4 lines
meta/recipes-support/icu/icu.inc deleted +0
-4-# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
meta/recipes-support/icu/icu.inc line 33
Quoted 2 lines
meta/recipes-support/icu/icu.inc deleted +0
-2- -EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
meta/recipes-support/icu/icu.inc line 34
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
meta/recipes-support/icu/icu.inc
Quoted 5 lines
meta/recipes-support/icu/icu.inc deleted +0
-5- -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up beingcompiled
meta/recipes-support/icu/icu.inc
Quoted 11 lines
meta/recipes-support/icu/icu.inc deleted +0
-11- # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
meta/recipes-support/icu/icu.inc line 51
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
meta/recipes-support/icu/icu.inc
Quoted 11 lines
meta/recipes-support/icu/icu.inc deleted +0
-11- cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
meta/recipes-support/icu/icu.inc
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8- fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Review
Quoted 15 lines
meta/recipes-support/icu/icu.inc deleted +0
-14- ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"(quoted diff) +0
-0b/meta/recipes-support/icu/icu_67.1.bb
meta/recipes-support/icu/icu_67.1.bb line 2
Quoted 7 lines
index
58638507c9..5814fa41bd100644meta/recipes-support/icu/icu_67.1.bb +2
-1@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is amature, \
meta/recipes-support/icu/icu_67.1.bb line 4
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0+portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), givingapplications the \
Quoted 12 lines
meta/recipes-support/icu/icu_67.1.bb +12
-0+same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"meta/recipes-support/icu/icu_67.1.bb
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb +10
-0+ +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its--with-cross-build option when
meta/recipes-support/icu/icu_67.1.bb line 27
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# cross-compiling. Taken the situation that different builds may sharea common sstate-cache
meta/recipes-support/icu/icu_67.1.bb
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb +4
-0+# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
meta/recipes-support/icu/icu_67.1.bb line 33
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0+ +EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
meta/recipes-support/icu/icu_67.1.bb line 34
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
meta/recipes-support/icu/icu_67.1.bb
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +5
-0+ +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up beingcompiled
meta/recipes-support/icu/icu_67.1.bb
Quoted 11 lines
meta/recipes-support/icu/icu_67.1.bb +11
-0+ # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
meta/recipes-support/icu/icu_67.1.bb line 51
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
meta/recipes-support/icu/icu_67.1.bb
Quoted 11 lines
meta/recipes-support/icu/icu_67.1.bb +11
-0+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
meta/recipes-support/icu/icu_67.1.bb
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+ fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 6 lines
meta/recipes-support/icu/icu_67.1.bb +6
-0+ ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/"meta/recipes-support/icu/icu_67.1.bb
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+ +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM ="file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0"
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +0
-1--2.27.0
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
Thanks for the quick response.
Steve
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Quoted 10 lines · Steve Sakoman
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Can you link to the failures please?
Quoted 274 lines · Steve Sakoman
Quoted 10 lines · Steve Sakoman
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 6 lines
Quoted 6 lines · Steve Sakoman
Quoted 5 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Steve
Quoted 2 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a
single file.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84---------------------------
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb | 85+++++++++++++++++++++++++++-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.inc(quoted diff) +0
-0b/meta/recipes-support/icu/icu.inc
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 2
Quoted 7 lines
deleted file mode 100644
index 6d9728903d..0000000000meta/recipes-support/icu/icu.inc deleted +0
-2@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is amature, \
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 3
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-portable set of C/C++ and Java libraries for Unicode support,software \
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 4
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-internationalization (I18N) and globalization (G11N), givingapplications the \
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
meta/recipes-support/icu/icu.inc deleted +0
-14-same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu.inc
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8- -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its--with-cross-build option when
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 27
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# cross-compiling. Taken the situation that different builds mayshare a common sstate-cache
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 28
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# into consideration, the native build directory needs to bestaged.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu.inc
Quoted 3 lines
meta/recipes-support/icu/icu.inc deleted +0
-3-EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu.inc line 33
Quoted 2 lines
meta/recipes-support/icu/icu.inc deleted +0
-2- -EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 34
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu.inc
Quoted 5 lines
meta/recipes-support/icu/icu.inc deleted +0
-5- -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end upbeing compiled
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu.inc
Quoted 4 lines
meta/recipes-support/icu/icu.inc deleted +0
-4- # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g'\
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 51
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/icu/icu.inc
Quoted 10 lines
meta/recipes-support/icu/icu.inc deleted +0
-10- cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 62
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu.inc
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8- fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" -Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-7-FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"(quoted diff) +0
-0b/meta/recipes-support/icu/icu_67.1.bb
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 2
Quoted 7 lines
index
58638507c9..5814fa41bd100644meta/recipes-support/icu/icu_67.1.bb +2
-1@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is amature, \
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 3
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+portable set of C/C++ and Java libraries for Unicode support,software \
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 4
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+internationalization (I18N) and globalization (G11N), givingapplications the \
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
meta/recipes-support/icu/icu_67.1.bb +14
-0+same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+ +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its--with-cross-build option when
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 27
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# cross-compiling. Taken the situation that different builds mayshare a common sstate-cache
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 28
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# into consideration, the native build directory needs to bestaged.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb +3
-0+EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb line 33
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0+ +EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 34
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +5
-0+ +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end upbeing compiled
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb +4
-0+ # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g'\
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb +7
-0+ -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 51
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb +10
-0+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 62
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+ fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
meta/recipes-support/icu/icu_67.1.bb +14
-0+ ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk"Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 86
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +0
-0LIC_FILES_CHKSUM ="file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +0
-1--2.27.0
Quoted 2 lines · Alexander Kanavin
Can you link to the failures please?
Yes, ppc failed too.
https://errors.yoctoproject.org/Errors/Details/417489/
https://errors.yoctoproject.org/Errors/Details/417486/
https://errors.yoctoproject.org/Errors/Details/417484/
Thanks for taking a look!
Steve
Quoted 234 lines · Steve Sakoman
Quoted 232 lines · Steve Sakoman
Quoted 10 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Ross
Quoted 233 lines · Steve Sakoman
Quoted 10 lines · Steve Sakoman
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Quoted 3 lines · Ross Burton
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Good theory -- ppc failed too.
Steve
Quoted 234 lines · Steve Sakoman
Quoted 233 lines · Steve Sakoman
Quoted 10 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Can you, for the sake of testing, upgrade icu to the same version as master? Those failures do not seem to be happening there.
Alex
Quoted 295 lines · Steve Sakoman
Quoted 3 lines · Ross Burton
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Good theory -- ppc failed too.
Steve
Quoted 3 lines · Steve Sakoman
Quoted 2 lines
On Thu, Jun 25, 2020 at 6:23 AM Steve Sakoman <[email protected]>
Quoted 8 lines · wrote:
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series.
In
Quoted 1 line
Quoted 1 line
Quoted 1 line
the interest of minimizing changes I'll keep the .inc file separate
as
Quoted 15 lines
Quoted 15 lines
Quoted 1 line
is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 1 line
Quoted 1 line
On Thu, 25 Jun 2020 at 18:04, Steve Sakoman <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Is this patch series suitable for dunfell as-is (the concern
being the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 2 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them
in a single file.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84---------------------------
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb | 85+++++++++++++++++++++++++++-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.inc(quoted diff) +0
-0b/meta/recipes-support/icu/icu.inc
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 2
Quoted 7 lines
deleted file mode 100644
index 6d9728903d..0000000000meta/recipes-support/icu/icu.inc deleted +0
-2@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU)is a mature, \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 3
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-portable set of C/C++ and Java libraries for Unicode support,software \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 4
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-internationalization (I18N) and globalization (G11N), givingapplications the \
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu.inc deleted +0
-4-same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu.inc line 16
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8-DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE ="${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/icu/icu.inc line 26
Quoted 10 lines
meta/recipes-support/icu/icu.inc deleted +0
-10- -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its--with-cross-build option when
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 27
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# cross-compiling. Taken the situation that different buildsmay share a common sstate-cache
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 28
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# into consideration, the native build directory needs to bestaged.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu.inc line 31
Quoted 3 lines
meta/recipes-support/icu/icu.inc deleted +0
-3-EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu.inc line 33
Quoted 2 lines
meta/recipes-support/icu/icu.inc deleted +0
-2- -EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 34
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu.inc line 39
Quoted 5 lines
meta/recipes-support/icu/icu.inc deleted +0
-5- -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end upbeing compiled
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu.inc line 43
Quoted 4 lines
meta/recipes-support/icu/icu.inc deleted +0
-4- # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/s,--sysroot=${STAGING_DIR_TARGET},,g' \
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 50
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 51
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 58
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct datafile.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu.inc line 61
Quoted 3 lines
meta/recipes-support/icu/icu.inc deleted +0
-3- # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 62
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu.inc line 70
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8- fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" -Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-7-FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"(quoted diff) +0
-0b/meta/recipes-support/icu/icu_67.1.bb
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 2
Quoted 7 lines
index
58638507c9..5814fa41bd100644meta/recipes-support/icu/icu_67.1.bb +2
-1@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU)is a mature, \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 3
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+portable set of C/C++ and Java libraries for Unicode support,software \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 4
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+internationalization (I18N) and globalization (G11N), givingapplications the \
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb +4
-0+same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb line 16
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE ="${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb line 26
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb +10
-0+ +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its--with-cross-build option when
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 27
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# cross-compiling. Taken the situation that different buildsmay share a common sstate-cache
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 28
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# into consideration, the native build directory needs to bestaged.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb line 31
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb +3
-0+EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb line 33
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0+ +EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 34
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb line 39
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +5
-0+ +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end upbeing compiled
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb line 43
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb +4
-0+ # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/s,--sysroot=${STAGING_DIR_TARGET},,g' \
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 50
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb +7
-0+ -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 51
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 58
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb +7
-0+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct datafile.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb line 61
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb +3
-0+ # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 62
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb line 70
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+ fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
meta/recipes-support/icu/icu_67.1.bb +14
-0+ ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk"Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 86
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +0
-0LIC_FILES_CHKSUM ="file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0"
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +0
-1--2.27.0
Quoted 2 lines · Alexander Kanavin
Can you, for the sake of testing, upgrade icu to the same version as master? Those failures do not seem to be happening there.
Yes, I'll give that a try with a local build first since the autobuilder is undergoing normal maintenance.
Steve
Quoted 245 lines · Steve Sakoman
Quoted 244 lines · Ross Burton
Quoted 3 lines
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Good theory -- ppc failed too.
Steve
Quoted 234 lines · Steve Sakoman
Quoted 233 lines · Steve Sakoman
Quoted 10 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Steve Sakoman via lists.openembedded.org
Quoted 2 lines · Alexander Kanavin
Can you, for the sake of testing, upgrade icu to the same version as master? Those failures do not seem to be happening there.
Yes, I'll give that a try with a local build first since the autobuilder is undergoing normal maintenance.
The local build succeeded, so the failure does seem to be related to the earlier version.
Is an upgrade to the new version reasonable for dunfell, or are there feature additions that would make it unsuitable?
Steve
Quoted 246 lines
Quoted 245 lines · Steve Sakoman
Quoted 244 lines · Ross Burton
Quoted 3 lines
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Good theory -- ppc failed too.
Steve
Quoted 234 lines · Steve Sakoman
Quoted 233 lines · Steve Sakoman
Quoted 10 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Technically, there are. I am not qualified to comment on how destabilizing they could be:
http://site.icu-project.org/download/67
Perhaps it is possible to bisect the code to identify the fix that can be cherry picked:
https://github.com/unicode-org/icu/releases/tag/release-67-1
Alex
Alex
Quoted 334 lines · Steve Sakoman
Quoted 5 lines · Steve Sakoman via lists.openembedded.org
Quoted 2 lines · Alexander Kanavin
Can you, for the sake of testing, upgrade icu to the same version as
master? Those failures do not seem to be happening there.
Quoted 3 lines
Yes, I'll give that a try with a local build first since the autobuilder is undergoing normal maintenance.
The local build succeeded, so the failure does seem to be related to the earlier version.
Is an upgrade to the new version reasonable for dunfell, or are there feature additions that would make it unsuitable?
Steve
Quoted 3 lines
Quoted 3 lines · Steve Sakoman
Quoted 2 lines
On Fri, Jun 26, 2020 at 5:49 AM Ross Burton <[email protected]>
Quoted 9 lines · wrote:
Quoted 9 lines
Quoted 9 lines
Quoted 3 lines
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Good theory -- ppc failed too.
Steve
Quoted 1 line
On Fri, 26 Jun 2020 at 16:27, Steve Sakoman <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
On Thu, Jun 25, 2020 at 6:23 AM Steve Sakoman <[email protected]>
Quoted 7 lines · wrote:
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell
that
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
implements the changes you have in the second patch of the
series. In
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
the interest of minimizing changes I'll keep the .inc file
separate as
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
is.
I recreated the patch for 66.1 and did a couple of quick local
builds
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I
seem to
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
recall some discussion about this (perhaps on irc?) but can only
find
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
one thread here on the list back when Khem's original patch went
in.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Did you recall any issues like this?
Steve
Quoted 1 line
Quoted 1 line
On Thu, 25 Jun 2020 at 18:04, Steve Sakoman <
Quoted 2 lines · [email protected]> wrote:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Is this patch series suitable for dunfell as-is (the concern
being the
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 2 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have
them in a single file.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84---------------------------
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb | 85+++++++++++++++++++++++++++-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.inc(quoted diff) +0
-0b/meta/recipes-support/icu/icu.inc
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 2
Quoted 7 lines
deleted file mode 100644
index 6d9728903d..0000000000meta/recipes-support/icu/icu.inc deleted +0
-2@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode(ICU) is a mature, \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 3
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-portable set of C/C++ and Java libraries for Unicodesupport, software \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 4
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-internationalization (I18N) and globalization (G11N),giving applications the \
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu.inc deleted +0
-4-same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu.inc line 16
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8-DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE ="${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/icu/icu.inc line 26
Quoted 10 lines
meta/recipes-support/icu/icu.inc deleted +0
-10- -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument toits --with-cross-build option when
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 27
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# cross-compiling. Taken the situation that differentbuilds may share a common sstate-cache
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 28
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-# into consideration, the native build directory needs tobe staged.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 29
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-EXTRA_OECONF ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu.inc line 31
Quoted 2 lines
meta/recipes-support/icu/icu.inc deleted +0
-2-EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu.inc line 33
Quoted 2 lines
meta/recipes-support/icu/icu.inc deleted +0
-2- -EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 34
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1-TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu.inc line 39
Quoted 5 lines
meta/recipes-support/icu/icu.inc deleted +0
-5- -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do notend up being compiled
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 40
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- # in the image. This only affects libicutu andicu-dbg
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu.inc line 43
Quoted 3 lines
meta/recipes-support/icu/icu.inc deleted +0
-3- sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/s,--sysroot=${STAGING_DIR_TARGET},,g' \
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 50
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 51
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu.inc line 58
Quoted 7 lines
meta/recipes-support/icu/icu.inc deleted +0
-7- cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correctdata file.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu.inc line 61
Quoted 3 lines
meta/recipes-support/icu/icu.inc deleted +0
-3- # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu.inc line 62
Quoted 1 line
meta/recipes-support/icu/icu.inc deleted +0
-1- icupkg -tb${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu.inc line 70
Quoted 8 lines
meta/recipes-support/icu/icu.inc deleted +0
-8- fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu.inc line 74
Quoted 4 lines
meta/recipes-support/icu/icu.inc deleted +0
-4- ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutulibicuio"
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Review
Quoted 11 lines
meta/recipes-support/icu/icu.inc deleted +0
-10- -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"(quoted diff) +0
-0b/meta/recipes-support/icu/icu_67.1.bb
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 2
Quoted 7 lines
index
58638507c9..5814fa41bd100644meta/recipes-support/icu/icu_67.1.bb +2
-1@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode(ICU) is a mature, \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 3
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+portable set of C/C++ and Java libraries for Unicodesupport, software \
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 4
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+internationalization (I18N) and globalization (G11N),giving applications the \
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb +4
-0+same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU"Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb line 16
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE ="${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb line 26
Quoted 10 lines
meta/recipes-support/icu/icu_67.1.bb +10
-0+ +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument toits --with-cross-build option when
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 27
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# cross-compiling. Taken the situation that differentbuilds may share a common sstate-cache
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 28
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+# into consideration, the native build directory needs tobe staged.
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 29
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+EXTRA_OECONF ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb line 31
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0+EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk ="--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb line 33
Quoted 2 lines
meta/recipes-support/icu/icu_67.1.bb +2
-0+ +EXTRA_OECONF_append_class-target ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 34
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+TARGET_CXXFLAGS_append ="${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb line 39
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +5
-0+ +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do notend up being compiled
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 40
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ # in the image. This only affects libicutu andicu-dbg
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb line 43
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb +3
-0+ sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/s,--sysroot=${STAGING_DIR_TARGET},,g' \
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 50
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb +7
-0+ -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 51
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ cp -r ${B}/config/icucross.inc${D}/${STAGING_ICU_DIR_NATIVE}/config
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb line 58
Quoted 7 lines
meta/recipes-support/icu/icu_67.1.bb +7
-0+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correctdata file.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb line 61
Quoted 3 lines
meta/recipes-support/icu/icu_67.1.bb +3
-0+ # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 62
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +1
-0+ icupkg -tb${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb line 70
Quoted 8 lines
meta/recipes-support/icu/icu_67.1.bb +8
-0+ fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb line 74
Quoted 4 lines
meta/recipes-support/icu/icu_67.1.bb +4
-0+ ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutulibicuio"
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
meta/recipes-support/icu/icu_67.1.bb +10
-0+ +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk"Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb line 86
Quoted 1 line
meta/recipes-support/icu/icu_67.1.bb +0
-0LIC_FILES_CHKSUM ="file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0"
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-support/icu/icu_67.1.bb +0
-1--2.27.0
Quoted 6 lines · Alexander Kanavin
Technically, there are. I am not qualified to comment on how destabilizing they could be:
http://site.icu-project.org/download/67Perhaps it is possible to bisect the code to identify the fix that can be cherry picked:
https://github.com/unicode-org/icu/releases/tag/release-67-1
Agreed, too many changes to take for LTS.
I think I'm just going to live with the occasional autobuilder failure. This seems like way more work that it is worth :-)
Steve
Quoted 270 lines · Steve Sakoman
Quoted 267 lines
Quoted 8 lines · Steve Sakoman via lists.openembedded.org
Quoted 2 lines · Alexander Kanavin
Can you, for the sake of testing, upgrade icu to the same version as master? Those failures do not seem to be happening there.
Yes, I'll give that a try with a local build first since the autobuilder is undergoing normal maintenance.
The local build succeeded, so the failure does seem to be related to the earlier version.
Is an upgrade to the new version reasonable for dunfell, or are there feature additions that would make it unsuitable?
Steve
Quoted 246 lines
Quoted 245 lines · Steve Sakoman
Quoted 244 lines · Ross Burton
Quoted 3 lines
Failures in edgerouter and MIPS screams the big-endian thing again. ICU is a disaster here, be warned.
Good theory -- ppc failed too.
Steve
Quoted 234 lines · Steve Sakoman
Quoted 233 lines · Steve Sakoman
Quoted 10 lines
Quoted 2 lines · Alexander Kanavin
I think you may have to recreate them by hand.
OK, I'll put together a patch for the 66.1 recipe in dunfell that implements the changes you have in the second patch of the series. In the interest of minimizing changes I'll keep the .inc file separate as is.
I recreated the patch for 66.1 and did a couple of quick local builds and things looked fine.
On the autobuilder I get failures for edgerouter and mips. I seem to recall some discussion about this (perhaps on irc?) but can only find one thread here on the list back when Khem's original patch went in.
Did you recall any issues like this?
Steve
Quoted 207 lines
Quoted 207 lines · Steve Sakoman
Quoted 206 lines
Is this patch series suitable for dunfell as-is (the concern being the contents of the version bump) or would a backport to 66.1 be necessary?
Steve
Quoted 197 lines · Alexander Kanavin
Both parts are rather convoluted, so it is better to have them in a single file.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/icu/icu.inc | 84 --------------------------- meta/recipes-support/icu/icu_67.1.bb | 85 +++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/icu/icu.incmeta/recipes-support/icu/icu.inc deleted +0
-84@@ -1,84 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native" -DEPENDS_class-native = "" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -BINCONFIG = "${bindir}/icu-config" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" - -inherit autotools pkgconfig binconfig multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" - -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile_prepend_class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install_append_class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES_${PN}-dev += "${libdir}/${BPN}/" - -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk"meta/recipes-support/icu/icu_67.1.bb +84
-2@@ -1,4 +1,87 @@ -require icu.inc +SUMMARY = "International Component for Unicode libraries" +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ +portable set of C/C++ and Java libraries for Unicode support, software \ +internationalization (I18N) and globalization (G11N), giving applications the \ +same results on all platforms." +HOMEPAGE = "http://site.icu-project.org/" + +LICENSE = "ICU" +DEPENDS = "icu-native" +DEPENDS_class-native = "" + +CVE_PRODUCT = "international_components_for_unicode" + +S = "${WORKDIR}/icu/source" +SPDX_S = "${WORKDIR}/icu" +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" + +BINCONFIG = "${bindir}/icu-config" + +ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}" + +inherit autotools pkgconfig binconfig multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" + +# ICU needs the native build directory as an argument to its --with-cross-build option when +# cross-compiling. Taken the situation that different builds may share a common sstate-cache +# into consideration, the native build directory needs to be staged. +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF_class-native = "" +EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" + +EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" + +ASNEEDED = "" + +do_compile_prepend_class-target () { + # Make sure certain build host references do not end up being compiled + # in the image. This only affects libicutu and icu-dbg + sed \ + -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ + -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ + -i ${B}/tools/toolutil/Makefile +} + +PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" +do_install_append_class-native() { + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} +} + +do_install_append_class-target() { + # The native pkgdata can not generate the correct data file. + # Use icupkg to re-generate it. + if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then + rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat + fi + + # Remove build host references... + sed -i \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + ${D}/${bindir}/icu-config ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \ + ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc +} + +PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" + +FILES_${PN}-dev += "${libdir}/${BPN}/" + +FILES_libicudata = "${libdir}/libicudata.so.*" +FILES_libicuuc = "${libdir}/libicuuc.so.*" +FILES_libicui18n = "${libdir}/libicui18n.so.*" +FILES_libicutu = "${libdir}/libicutu.so.*" +FILES_libicuio = "${libdir}/libicuio.so.*" + +BBCLASSEXTEND = "native nativesdk" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" --2.27.0
Quoted 6 lines · Steve Sakoman
Quoted 4 lines · Alexander Kanavin
Technically, there are. I am not qualified to comment on how destabilizing they could be:
http://site.icu-project.org/download/67
Quoted 8 lines
Quoted 3 lines
Perhaps it is possible to bisect the code to identify the fix that can be cherry picked:
https://github.com/unicode-org/icu/releases/tag/release-67-1Agreed, too many changes to take for LTS.
I think I'm just going to live with the occasional autobuilder failure. This seems like way more work that it is worth :-)
I think its simpler. Look at the original implementation patch:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=72a56c2bd02d32382260d4f4fd14ab4c8d4cb8f4
specifically this bit:
file://fix-install-manx.patch \
- file://0001-Fix-big-endian-build.patch \
+ file://0001-Fix-big-endian-build.patch;apply=no \
file://0001-icu-Added-armeb-support.patch \I think the apply=no needs to be toggled depending on the PACKAGECONFIG?
Cheers,
Richard
Quoted 28 lines · Richard Purdie
Quoted 6 lines · Steve Sakoman
Quoted 4 lines · Alexander Kanavin
Technically, there are. I am not qualified to comment on how destabilizing they could be:
http://site.icu-project.org/download/67Quoted 8 lines
Quoted 3 lines
Perhaps it is possible to bisect the code to identify the fix that can be cherry picked:
https://github.com/unicode-org/icu/releases/tag/release-67-1Agreed, too many changes to take for LTS.
I think I'm just going to live with the occasional autobuilder failure. This seems like way more work that it is worth :-)
I think its simpler. Look at the original implementation patch:
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=72a56c2bd02d32382260d4f4fd14ab4c8d4cb8f4
specifically this bit:
file://fix-install-manx.patch \(quoted diff) +1
-1- file://0001-Fix-big-endian-build.patch \ + file://0001-Fix-big-endian-build.patch;apply=no \ file://0001-icu-Added-armeb-support.patch \
Quoted 1 line
I think the apply=no needs to be toggled depending on the PACKAGECONFIG?
I'll give this a try on Monday. Thanks for pointing that out!
Steve