summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch45
-rw-r--r--meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb14
3 files changed, 1 insertions, 60 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index c77a1e54e6..84a0df1d25 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -104,7 +104,7 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\
104RDEPENDS_packagegroup-meta-oe-devtools ="\ 104RDEPENDS_packagegroup-meta-oe-devtools ="\
105 android-tools android-tools-conf bootchart breakpad \ 105 android-tools android-tools-conf bootchart breakpad \
106 capnproto cgdb cscope ctags \ 106 capnproto cgdb cscope ctags \
107 debootstrap dejagnu dmalloc flatbuffers \ 107 debootstrap dmalloc flatbuffers \
108 giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ 108 giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \
109 kconfig-frontends lemon libedit libgee libsombok3 \ 109 kconfig-frontends lemon libedit libgee libsombok3 \
110 libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ 110 libubox log4cplus lshw ltrace lua mcpp memstat mercurial \
diff --git a/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch b/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
deleted file mode 100644
index 2eb8af7130..0000000000
--- a/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Index: dejagnu-1.4.4/configure.in
2===================================================================
3--- dejagnu-1.4.4.orig/configure.in 2014-07-18 07:05:49.997481207 +0000
4+++ dejagnu-1.4.4/configure.in 2014-07-18 07:05:50.085481210 +0000
5@@ -1,10 +1,10 @@
6 dnl Process this file with autoconf to produce a configure script.
7 AC_PREREQ(2.13)
8-AC_INIT(runtest.exp)
9+AC_INIT(dejagnu, 1.4.4)
10 dnl AC_CONFIG_AUX_DIR(..)
11
12 dnl These are required by automake
13-AM_INIT_AUTOMAKE(dejagnu, 1.4.4)
14+AM_INIT_AUTOMAKE([foreign])
15 AM_MAINTAINER_MODE
16 AC_PROG_MAKE_SET
17
18Index: dejagnu-1.4.4/example/calc/configure.in
19===================================================================
20--- dejagnu-1.4.4.orig/example/calc/configure.in 2002-04-26 03:32:40.000000000 +0000
21+++ dejagnu-1.4.4/example/calc/configure.in 2014-07-18 07:11:59.085491266 +0000
22@@ -1,8 +1,8 @@
23 dnl Process this file with autoconf to produce a configure script.
24 AC_PREREQ(2.5)
25-AC_INIT(calc.c)
26+AC_INIT(calc, 1.1)
27 AM_CONFIG_HEADER(calc.h)
28-AM_INIT_AUTOMAKE(calc, 1.1)
29+AM_INIT_AUTOMAKE([foreign])
30
31 AC_PROG_CC
32 AC_PROG_INSTALL
33Index: dejagnu-1.4.4/example/hello/configure.in
34===================================================================
35--- dejagnu-1.4.4.orig/example/hello/configure.in 2002-08-31 05:46:16.000000000 +0000
36+++ dejagnu-1.4.4/example/hello/configure.in 2014-07-18 07:12:23.721491937 +0000
37@@ -25,7 +25,7 @@
38 # ------------------------------------------------------------------------
39
40 AC_INIT(helloworld, demo-version, philip.wilsey@ieee.org)
41-AM_INIT_AUTOMAKE(helloworld, demo-version)
42+AM_INIT_AUTOMAKE([foreign])
43
44 #AC_CONFIG_SRCDIR([hello.cc])
45 #AC_CONFIG_HEADER([config.h])
diff --git a/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb b/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
deleted file mode 100644
index 63726b2328..0000000000
--- a/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SUMMARY = "GNU unit testing framework, written in Expect and Tcl"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
4SECTION = "devel"
5
6inherit autotools
7
8SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
9 file://configure.patch"
10
11SRC_URI[md5sum] = "053f18fd5d00873de365413cab17a666"
12SRC_URI[sha256sum] = "d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d"
13
14BBCLASSEXTEND = "native"