systemtap: update to version 1.8
Update the systemtap recipes to the recently released 1.8. Remove a couple patches whose changes are already present in the new version. (From OE-Core rev: 1c5a127d075ebf78b70d14e3ca1d0ff640a80cb8) Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d7be5def1c
commit
b8c9a593b5
|
@ -1,50 +0,0 @@
|
|||
From fa81ccd4f92e5cb15a11a81a7e656bfe01745afb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 5 Jun 2012 10:22:23 +0200
|
||||
Subject: [PATCH] runtime/staprun/configure.ac: support --without-nss for
|
||||
staprun
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Submitted
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
runtime/staprun/configure.ac | 20 +++++++++++++++-----
|
||||
1 files changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
|
||||
index 8fd1b42..7b05f73 100644
|
||||
--- a/runtime/staprun/configure.ac
|
||||
+++ b/runtime/staprun/configure.ac
|
||||
@@ -67,11 +67,21 @@ AS_IF([test "x$enable_sdt_probes" != xno], [
|
||||
[Define to 1 to enable process.mark probes in staprun, stapio.])
|
||||
])
|
||||
|
||||
-PKG_CHECK_MODULES([nss], [nss >= 3], [have_nss=yes], [have_nss=no])
|
||||
-AM_CONDITIONAL([HAVE_NSS], [test $have_nss = yes])
|
||||
-AS_IF([test $have_nss = yes], [
|
||||
- AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
|
||||
-])
|
||||
+dnl See if we have the nss/nspr headers and libraries
|
||||
+AC_ARG_WITH([nss],
|
||||
+ AS_HELP_STRING([--without-nss],
|
||||
+ [Do not use NSS even if present]))
|
||||
+
|
||||
+AS_IF([test "x$with_nss" != "xno"], [
|
||||
+ PKG_CHECK_MODULES([nss], [nss >= 3],
|
||||
+ [have_nss=yes
|
||||
+ AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
|
||||
+ ], [have_nss=no])
|
||||
+], [have_nss=no])
|
||||
+
|
||||
+AM_CONDITIONAL([HAVE_NSS], [test "${have_nss}" = "yes"])
|
||||
+
|
||||
+
|
||||
AC_ARG_ENABLE([nls], [AS_HELP_STRING([--enable-nls], [enable translating program messages])])
|
||||
AS_IF([test "x$enable_nls" != xno], [
|
||||
AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if program messages should be translated.])
|
||||
--
|
||||
1.7.6.5
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
Automake 1.12 has deprecated automatic de-ANSI-fication support
|
||||
|
||||
Fix this issue with automake 1.12:
|
||||
|
||||
| configure.ac:23: error: automatic de-ANSI-fication support has been removed
|
||||
|
||||
Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2012/05/02
|
||||
|
||||
Index: git/configure.ac
|
||||
===================================================================
|
||||
--- git.orig/configure.ac
|
||||
+++ git/configure.ac
|
||||
@@ -20,7 +20,6 @@ AC_PROG_CXX
|
||||
AC_PROG_CPP
|
||||
AM_PROG_CC_STDC
|
||||
AM_PROG_CC_C_O
|
||||
-AM_C_PROTOTYPES
|
||||
AC_PROG_RANLIB
|
||||
AC_OBJEXT
|
||||
AC_EXEEXT
|
|
@ -6,7 +6,7 @@ DEPENDS = "elfutils sqlite3 systemtap-native"
|
|||
DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
|
||||
DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
|
||||
|
||||
PR = "r5"
|
||||
PR = "r0"
|
||||
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
|
||||
PV = "1.7+git${SRCPV}"
|
||||
SRCREV = "48fa6b5e1d3e636c34cbd5650370e6f634efc294"
|
||||
PV = "1.8+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
|
||||
file://docproc-build-fix.patch \
|
||||
file://systemtap_fix_for_automake_1.12.patch \
|
||||
file://runtime-staprun-configure.ac-support-without-nss-for.patch \
|
||||
"
|
||||
|
||||
FILESPATH = "${FILE_DIRNAME}/systemtap"
|
||||
|
|
Loading…
Reference in New Issue