summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-11 06:01:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-12 13:22:43 +0000
commit311924f506b796e42cd287180cf580f176d46399 (patch)
treec46b0e9e7375a707a31106301aa8ff7823ac8574
parent41042073b094b8d4a1e226452c053b767966adc0 (diff)
downloadpoky-311924f506b796e42cd287180cf580f176d46399.tar.gz
systemtap: 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. (From OE-Core rev: 3a335af7da5a94249d2f0d49d89cf0c8f180776e) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch27
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb2
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
3 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..c2d6d43402
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
@@ -0,0 +1,27 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff --git a/configure.ac b/configure.ac
5index 2a30ea1..713800d 100644
6--- a/configure.ac
7+++ b/configure.ac
8@@ -18,7 +18,6 @@ AC_PROG_LN_S
9 AC_PROG_CC
10 AC_PROG_CXX
11 AC_PROG_CPP
12-AM_PROG_CC_STDC
13 AM_PROG_CC_C_O
14 AC_PROG_RANLIB
15 AC_OBJEXT
16diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
17index 48f48db..68152db 100644
18--- a/runtime/staprun/configure.ac
19+++ b/runtime/staprun/configure.ac
20@@ -13,7 +13,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
21
22 AC_PROG_CC
23 AC_PROG_CXX
24-AM_PROG_CC_STDC
25 AM_PROG_CC_C_O
26 AC_PROG_INSTALL
27 AC_SYS_LARGEFILE
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index a490a2ea56..7fc92c8487 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "elfutils sqlite3 systemtap-native"
6DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" 6DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
7DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" 7DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
8 8
9PR = "r0" 9PR = "r1"
10 10
11EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ 11EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
12 --without-nss --without-avahi \ 12 --without-nss --without-avahi \
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 3e7bc7bfc2..6c67d34cb1 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -6,6 +6,7 @@ PV = "1.8+git${SRCPV}"
6 6
7SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \ 7SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
8 file://docproc-build-fix.patch \ 8 file://docproc-build-fix.patch \
9 file://obsolete_automake_macros.patch \
9 " 10 "
10 11
11FILESPATH = "${FILE_DIRNAME}/systemtap" 12FILESPATH = "${FILE_DIRNAME}/systemtap"