summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-09-03 18:34:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-04 16:23:55 +0100
commite874dd2667536a2cf617ec38accc661c9ae12217 (patch)
tree6d9a4fb5de603000d0567385ad150cd2449ec166
parent5effdb3940c0e3f1e739b2803716afd8b49fe2f3 (diff)
downloadpoky-e874dd2667536a2cf617ec38accc661c9ae12217.tar.gz
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 (From OE-Core rev: fb781bee39e312eef1d89c2d7f5ab27e8da1ee32) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/remake/remake.inc4
-rw-r--r--meta/recipes-devtools/remake/remake/remake-remove-errors-about-colophon-and-cygnus-comma.patch39
-rw-r--r--meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb (renamed from meta/recipes-devtools/remake/remake_git.bb)8
3 files changed, 4 insertions, 47 deletions
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 @@
1SUMMARY = "Makefile debugger which is gnumake 3.81 compatible" 1SUMMARY = "Makefile debugger which is gnumake compatible"
2DESCRIPTION = "remake is a patched and modernized version of GNU make \ 2DESCRIPTION = "remake is a patched and modernized version of GNU make \
3utility that adds improved error reporting, the ability to trace \ 3utility that adds improved error reporting, the ability to trace \
4execution in a comprehensible way, and a debugger." 4execution in a comprehensible way, and a debugger."
@@ -8,7 +8,7 @@ SECTION = "devel"
8 8
9SRC_URI = "git://github.com/rocky/remake.git" 9SRC_URI = "git://github.com/rocky/remake.git"
10 10
11inherit autotools gettext update-alternatives 11inherit autotools gettext update-alternatives pkgconfig
12 12
13ALTERNATIVE_${PN} = "make" 13ALTERNATIVE_${PN} = "make"
14ALTERNATIVE_LINK_NAME[make] = "${bindir}/make" 14ALTERNATIVE_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 @@
1From 1316f10a97a4a2f5d11a30ec367aa61101318742 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@enea.com>
3Date: Wed, 6 Aug 2014 15:05:56 +0200
4Subject: [PATCH] remake: remove errors about @colophon and @cygnus commands
5 not defined
6
7texinfo5 needs replacing @ with @@ when it is part of the text
8
9Upstream-Status: Backport
10Signed-off-by: Maxin B. John <maxin.john@enea.com>
11---
12 doc/remake.texi | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/doc/remake.texi b/doc/remake.texi
16index cd73437..fa5ba16 100644
17--- a/doc/remake.texi
18+++ b/doc/remake.texi
19@@ -2752,7 +2752,7 @@ this list, we would like to add your names!
20 @printindex cp
21
22 @tex
23-% I think something like @colophon should be in texinfo. In the
24+% I think something like @@colophon should be in texinfo. In the
25 % meantime:
26 \long\def\colophon{\hbox to0pt{}\vfill
27 \centerline{The body of this manual is set in}
28@@ -2764,7 +2764,7 @@ this list, we would like to add your names!
29 \centerline{{\sl\fontname\tensl\/}}
30 \centerline{are used for emphasis.}\vfill}
31 \page\colophon
32-% Blame: doc@cygnus.com, 1991.
33+% Blame: doc@@cygnus.com, 1991.
34 @end tex
35
36 @bye
37--
381.9.1
39
diff --git a/meta/recipes-devtools/remake/remake_git.bb b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
index 2ba2b809f8..c61913d056 100644
--- a/meta/recipes-devtools/remake/remake_git.bb
+++ b/meta/recipes-devtools/remake/remake_4.1+dbg-1.1.bb
@@ -1,4 +1,3 @@
1PR = "r1"
2LICENSE = "GPLv2" 1LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 2LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 3 file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
@@ -6,14 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
6require remake.inc 5require remake.inc
7 6
8SRC_URI += "file://version-remake.texi.patch \ 7SRC_URI += "file://version-remake.texi.patch \
9 file://remake-remove-errors-about-colophon-and-cygnus-comma.patch \
10 " 8 "
11SRCREV = "f05508e521987c8494c92d9c2871aec46307d51d" 9SRCREV = "cf54641d50a0165bb17622b3e9770f426ccbc561"
12S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
13 11
14PV = "3.82+dbg-0.9+git${SRCPV}" 12DEPENDS += "readline guile"
15
16DEPENDS += "readline"
17# Need to add "gettext-native" dependency to remake-native. 13# Need to add "gettext-native" dependency to remake-native.
18# By default only "gettext-minimal-native" is added 14# By default only "gettext-minimal-native" is added
19# when inherit gettext. 15# when inherit gettext.