From fb781bee39e312eef1d89c2d7f5ab27e8da1ee32 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 3 Sep 2015 18:34:18 +0300 Subject: remake: update to 4.1+dbg-1.1 remake-remove-errors-about-colophon-and-cygnus-comma.patch has been merged upstream inherit pkgconfig has been added because m4 macros defined by pkgconfig are now used in configure.ac Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/remake/remake.inc | 4 +-- ...ve-errors-about-colophon-and-cygnus-comma.patch | 39 ---------------------- meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb | 27 +++++++++++++++ meta/recipes-devtools/remake/remake_git.bb | 31 ----------------- 4 files changed, 29 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch create mode 100644 meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb delete mode 100644 meta/recipes-devtools/remake/remake_git.bb diff --git a/meta/recipes-devtools/remake/remake.inc b/meta/recipes-devtools/remake/remake.inc index 6ac833efd5..df889fcf9f 100644 --- a/meta/recipes-devtools/remake/remake.inc +++ b/meta/recipes-devtools/remake/remake.inc @@ -1,4 +1,4 @@ -SUMMARY = "Makefile debugger which is gnumake 3.81 compatible" +SUMMARY = "Makefile debugger which is gnumake compatible" DESCRIPTION = "remake is a patched and modernized version of GNU make \ utility that adds improved error reporting, the ability to trace \ execution in a comprehensible way, and a debugger." @@ -8,7 +8,7 @@ SECTION = "devel" SRC_URI = "git://github.com/rocky/remake.git" -inherit autotools gettext update-alternatives +inherit autotools gettext update-alternatives pkgconfig ALTERNATIVE_${PN} = "make" ALTERNATIVE_LINK_NAME[make] = "${bindir}/make" diff --git a/meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch b/meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch deleted file mode 100644 index 98b646092b..0000000000 --- a/meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1316f10a97a4a2f5d11a30ec367aa61101318742 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -Date: Wed, 6 Aug 2014 15:05:56 +0200 -Subject: [PATCH] remake: remove errors about @colophon and @cygnus commands - not defined - -texinfo5 needs replacing @ with @@ when it is part of the text - -Upstream-Status: Backport -Signed-off-by: Maxin B. John ---- - doc/remake.texi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/remake.texi b/doc/remake.texi -index cd73437..fa5ba16 100644 ---- a/doc/remake.texi -+++ b/doc/remake.texi -@@ -2752,7 +2752,7 @@ this list, we would like to add your names! - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -2764,7 +2764,7 @@ this list, we would like to add your names! - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 1991. -+% Blame: doc@@cygnus.com, 1991. - @end tex - - @bye --- -1.9.1 - diff --git a/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb new file mode 100644 index 0000000000..c61913d056 --- /dev/null +++ b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb @@ -0,0 +1,27 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" +require remake.inc + +SRC_URI += "file://version-remake.texi.patch \ + " +SRCREV = "cf54641d50a0165bb17622b3e9770f426ccbc561" +S = "${WORKDIR}/git" + +DEPENDS += "readline guile" +# Need to add "gettext-native" dependency to remake-native. +# By default only "gettext-minimal-native" is added +# when inherit gettext. +DEPENDS_class-native += "gettext-native" +PROVIDES += "make" + +do_configure_prepend() { + # remove the default LINGUAS since we are not going to generate languages + rm ${S}/po/LINGUAS + touch ${S}/po/LINGUAS + # create config.rpath which required by configure.ac + ( cd ${S}; autopoint || touch config.rpath ) +} + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/remake/remake_git.bb b/meta/recipes-devtools/remake/remake_git.bb deleted file mode 100644 index 2ba2b809f8..0000000000 --- a/meta/recipes-devtools/remake/remake_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -PR = "r1" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4" -require remake.inc - -SRC_URI += "file://version-remake.texi.patch \ - file://remake-remove-errors-about-colophon-and-cygnus-comma.patch \ - " -SRCREV = "f05508e521987c8494c92d9c2871aec46307d51d" -S = "${WORKDIR}/git" - -PV = "3.82+dbg-0.9+git${SRCPV}" - -DEPENDS += "readline" -# Need to add "gettext-native" dependency to remake-native. -# By default only "gettext-minimal-native" is added -# when inherit gettext. -DEPENDS_class-native += "gettext-native" -PROVIDES += "make" - -do_configure_prepend() { - # remove the default LINGUAS since we are not going to generate languages - rm ${S}/po/LINGUAS - touch ${S}/po/LINGUAS - # create config.rpath which required by configure.ac - ( cd ${S}; autopoint || touch config.rpath ) -} - -BBCLASSEXTEND = "native" -- cgit 1.2.3-korg