From 26289550c572ac4a7c06a21354f8dc7bcbd38114 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Mon, 3 Jul 2017 04:45:47 -0400 Subject: grep: upgrade to 3.1 Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- meta/recipes-extended/grep/grep_3.0.bb | 46 ---------------------------------- meta/recipes-extended/grep/grep_3.1.bb | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-extended/grep/grep_3.0.bb create mode 100644 meta/recipes-extended/grep/grep_3.1.bb diff --git a/meta/recipes-extended/grep/grep_3.0.bb b/meta/recipes-extended/grep/grep_3.0.bb deleted file mode 100644 index b2940d5429..0000000000 --- a/meta/recipes-extended/grep/grep_3.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "GNU grep utility" -HOMEPAGE = "http://savannah.gnu.org/projects/grep/" -BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" -SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee" - -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - " - -SRC_URI[md5sum] = "fa07c1616adeb9c3262be5177d10ad4a" -SRC_URI[sha256sum] = "e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5" - -inherit autotools gettext texinfo pkgconfig - -EXTRA_OECONF = "--disable-perl-regexp" - -# Fix "Argument list too long" error when len(TMPDIR) = 410 -acpaths = "-I ./m4" - -do_configure_prepend () { - rm -f ${S}/m4/init.m4 -} - -do_install () { - autotools_do_install - if [ "${base_bindir}" != "${bindir}" ]; then - install -d ${D}${base_bindir} - mv ${D}${bindir}/grep ${D}${base_bindir}/grep - mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep - mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep - rmdir ${D}${bindir}/ - fi -} - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "grep egrep fgrep" -ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" -ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" -ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" - -export CONFIG_SHELL="/bin/sh" diff --git a/meta/recipes-extended/grep/grep_3.1.bb b/meta/recipes-extended/grep/grep_3.1.bb new file mode 100644 index 0000000000..05b6b93949 --- /dev/null +++ b/meta/recipes-extended/grep/grep_3.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "GNU grep utility" +HOMEPAGE = "http://savannah.gnu.org/projects/grep/" +BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee" + +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + " + +SRC_URI[md5sum] = "feca7b3e7c7f4aab2b42ecbfc513b070" +SRC_URI[sha256sum] = "db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e" + +inherit autotools gettext texinfo pkgconfig + +EXTRA_OECONF = "--disable-perl-regexp" + +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + +do_configure_prepend () { + rm -f ${S}/m4/init.m4 +} + +do_install () { + autotools_do_install + if [ "${base_bindir}" != "${bindir}" ]; then + install -d ${D}${base_bindir} + mv ${D}${bindir}/grep ${D}${base_bindir}/grep + mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep + mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep + rmdir ${D}${bindir}/ + fi +} + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "grep egrep fgrep" +ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" +ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" +ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" + +export CONFIG_SHELL="/bin/sh" -- cgit 1.2.3-korg