summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch50
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch23
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb2
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc6
4 files changed, 3 insertions, 78 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch b/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch
deleted file mode 100644
index eef414a895..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From fa81ccd4f92e5cb15a11a81a7e656bfe01745afb Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Tue, 5 Jun 2012 10:22:23 +0200
4Subject: [PATCH] runtime/staprun/configure.ac: support --without-nss for
5 staprun
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Submitted
11
12Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13---
14 runtime/staprun/configure.ac | 20 +++++++++++++++-----
15 1 files changed, 15 insertions(+), 5 deletions(-)
16
17diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
18index 8fd1b42..7b05f73 100644
19--- a/runtime/staprun/configure.ac
20+++ b/runtime/staprun/configure.ac
21@@ -67,11 +67,21 @@ AS_IF([test "x$enable_sdt_probes" != xno], [
22 [Define to 1 to enable process.mark probes in staprun, stapio.])
23 ])
24
25-PKG_CHECK_MODULES([nss], [nss >= 3], [have_nss=yes], [have_nss=no])
26-AM_CONDITIONAL([HAVE_NSS], [test $have_nss = yes])
27-AS_IF([test $have_nss = yes], [
28- AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
29-])
30+dnl See if we have the nss/nspr headers and libraries
31+AC_ARG_WITH([nss],
32+ AS_HELP_STRING([--without-nss],
33+ [Do not use NSS even if present]))
34+
35+AS_IF([test "x$with_nss" != "xno"], [
36+ PKG_CHECK_MODULES([nss], [nss >= 3],
37+ [have_nss=yes
38+ AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
39+ ], [have_nss=no])
40+], [have_nss=no])
41+
42+AM_CONDITIONAL([HAVE_NSS], [test "${have_nss}" = "yes"])
43+
44+
45 AC_ARG_ENABLE([nls], [AS_HELP_STRING([--enable-nls], [enable translating program messages])])
46 AS_IF([test "x$enable_nls" != xno], [
47 AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if program messages should be translated.])
48--
491.7.6.5
50
diff --git a/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch b/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch
deleted file mode 100644
index ef74a09587..0000000000
--- a/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Pending
2
3Automake 1.12 has deprecated automatic de-ANSI-fication support
4
5Fix this issue with automake 1.12:
6
7| configure.ac:23: error: automatic de-ANSI-fication support has been removed
8
9Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
102012/05/02
11
12Index: git/configure.ac
13===================================================================
14--- git.orig/configure.ac
15+++ git/configure.ac
16@@ -20,7 +20,6 @@ AC_PROG_CXX
17 AC_PROG_CPP
18 AM_PROG_CC_STDC
19 AM_PROG_CC_C_O
20-AM_C_PROTOTYPES
21 AC_PROG_RANLIB
22 AC_OBJEXT
23 AC_EXEEXT
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 7ed5fcdc47..059aca7b34 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_virtclass-native = "elfutils-native sqlite3-native gettext-native" 6DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
7DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" 7DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
8 8
9PR = "r5" 9PR = "r0"
10 10
11export CC_FOR_BUILD = "${BUILD_CC}" 11export CC_FOR_BUILD = "${BUILD_CC}"
12export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" 12export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 5f2987b6f8..093e62d16f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,13 +1,11 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3 3
4SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" 4SRCREV = "48fa6b5e1d3e636c34cbd5650370e6f634efc294"
5PV = "1.7+git${SRCPV}" 5PV = "1.8+git${SRCPV}"
6 6
7SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \ 7SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
8 file://docproc-build-fix.patch \ 8 file://docproc-build-fix.patch \
9 file://systemtap_fix_for_automake_1.12.patch \
10 file://runtime-staprun-configure.ac-support-without-nss-for.patch \
11 " 9 "
12 10
13FILESPATH = "${FILE_DIRNAME}/systemtap" 11FILESPATH = "${FILE_DIRNAME}/systemtap"