aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-17 10:52:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 05:52:26 -0800
commit254799258ead1b7a59c301ad2d3e3c7e5b9fb8db (patch)
tree0388dd97d868e4101e1976f253ab551c157e8b4f
parent86284e488a984ee161af75bee30440b827bd72c9 (diff)
downloadopenembedded-core-contrib-254799258ead1b7a59c301ad2d3e3c7e5b9fb8db.tar.gz
openembedded-core-contrib-254799258ead1b7a59c301ad2d3e3c7e5b9fb8db.tar.bz2
openembedded-core-contrib-254799258ead1b7a59c301ad2d3e3c7e5b9fb8db.zip
oprofileui-server: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Removed AM_PROG_CC_STDC. AC_PROG_CC to replace it was already present. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch20
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-server_git.bb6
2 files changed, 24 insertions, 2 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch b/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..2f86f48fe6
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofileui-server/obsolete_automake_macros.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Pending
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff --git a/configure.ac b/configure.ac
+index 2a7010b..62a177e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,11 +3,10 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(oprofileui, 0.2.0)
+
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AC_PROG_RANLIB
+ AC_PROG_INTLTOOL
diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index e75923f2a3..6b848af75f 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -2,12 +2,14 @@ require oprofileui.inc
SRCREV = "82ecf8c6b53b84f80682a8312f9defa83a95f2a3"
PV = "0.0+git${SRCPV}"
-PR = "r0"
+PR = "r1"
S = "${WORKDIR}/git"
SRC_URI = "git://git.yoctoproject.org/oprofileui;protocol=git \
- file://init"
+ file://init \
+ file://obsolete_automake_macros.patch \
+"
EXTRA_OECONF += "--disable-client --enable-server"