diff options
Diffstat (limited to 'meta/recipes-devtools/m4/m4-1.4.19.inc')
| -rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.19.inc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc b/meta/recipes-devtools/m4/m4-1.4.19.inc index 5f3d59226e..fcc9e58270 100644 --- a/meta/recipes-devtools/m4/m4-1.4.19.inc +++ b/meta/recipes-devtools/m4/m4-1.4.19.inc @@ -8,15 +8,17 @@ inherit autotools texinfo ptest gettext SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ file://ac_config_links.patch \ + file://0001-sigsegv-Fix-build-on-ppc-musl.patch \ + file://0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch \ " -SRC_URI_append_class-target = " file://run-ptest \ +SRC_URI:append:class-target = " file://run-ptest \ file://serial-tests-config.patch \ " SRC_URI[md5sum] = "f4a2b0284d80353b995f8ef2385ed73c" SRC_URI[sha256sum] = "3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\ file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" @@ -38,8 +40,6 @@ do_install_ptest() { cp -r ${B}/tests ${D}${PTEST_PATH} cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile - sed -i -e "s;LOCALE_FR='fr_FR';LOCALE_FR='fr_FR.iso88591';g" \ - -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} cp ${S}/build-aux/update-copyright ${D}${PTEST_PATH}/tests/ sed -i 's;update-copyright;./update-copyright;g' ${D}${PTEST_PATH}/tests/test-update-copyright.sh @@ -50,12 +50,18 @@ do_install_ptest() { ln -s ptest ${D}${libdir}/${BPN}/${BP} } +do_install_ptest:append:libc-glibc() { + sed -i -e "s;LOCALE_FR='fr_FR';LOCALE_FR='fr_FR.iso88591';g" \ + -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile +} -RDEPENDS_${PN}-ptest += "make coreutils diffutils" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest += "make coreutils diffutils bash" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ + locale-base-fr-fr \ locale-base-fr-fr.iso-8859-1 \ + glibc-gconv-iso8859-1 \ " -INSANE_SKIP_${PN}-ptest += "ldflags" -INSANE_SKIP_${PN}-ptest += "rpaths" +INSANE_SKIP:${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "rpaths" |