From 3a335af7da5a94249d2f0d49d89cf0c8f180776e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 11 Feb 2013 06:01:36 +0200 Subject: 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. Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold --- .../systemtap/obsolete_automake_macros.patch | 27 ++++++++++++++++++++++ meta/recipes-kernel/systemtap/systemtap_git.bb | 2 +- meta/recipes-kernel/systemtap/systemtap_git.inc | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch (limited to 'meta/recipes-kernel/systemtap') 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 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist +diff --git a/configure.ac b/configure.ac +index 2a30ea1..713800d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,6 @@ AC_PROG_LN_S + AC_PROG_CC + AC_PROG_CXX + AC_PROG_CPP +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_RANLIB + AC_OBJEXT +diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac +index 48f48db..68152db 100644 +--- a/runtime/staprun/configure.ac ++++ b/runtime/staprun/configure.ac +@@ -13,7 +13,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + AC_PROG_CC + AC_PROG_CXX +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_INSTALL + 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" DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" -PR = "r0" +PR = "r1" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ --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}" SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \ file://docproc-build-fix.patch \ + file://obsolete_automake_macros.patch \ " FILESPATH = "${FILE_DIRNAME}/systemtap" -- cgit 1.2.3-korg