diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-07 16:36:49 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-08 11:31:03 +0100 |
| commit | bd17907884e3a1e1d711125a4b8def5263e97edb (patch) | |
| tree | 73e457e986d43d966140df218f8c69d9fe607884 /meta | |
| parent | f8a054aca9962ebfd4c74fc1d34cd684de6b3568 (diff) | |
| download | openembedded-core-bd17907884e3a1e1d711125a4b8def5263e97edb.tar.gz openembedded-core-bd17907884e3a1e1d711125a4b8def5263e97edb.tar.bz2 openembedded-core-bd17907884e3a1e1d711125a4b8def5263e97edb.zip | |
systemtap: Unbreak build for systems with nss headers installed
* discussed on [1]
* patch sent to systemtap [2]
[1] http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/023377.html
[2] http://sourceware.org/ml/systemtap/2012-q2/msg00202.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 54 insertions, 7 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 new file mode 100644 index 0000000000..fbe7b708d8 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch @@ -0,0 +1,50 @@ +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: pending + +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 + diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 4d340fc8a2..7ed5fcdc47 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -6,19 +6,15 @@ DEPENDS = "elfutils sqlite3 systemtap-native" DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" -PR = "r4" +PR = "r5" export CC_FOR_BUILD = "${BUILD_CC}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ - ac_cv_file__usr_include_nss=no \ - ac_cv_file__usr_include_nss3=no \ - ac_cv_file__usr_include_nspr=no \ - ac_cv_file__usr_include_nspr4=no \ - ac_cv_file__usr_include_avahi_client=no \ - ac_cv_file__usr_include_avahi_common=no " + --without-nss --without-avahi \ + --disable-server --disable-grapher " STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs" diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 9f4feee8ce..5f2987b6f8 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -7,6 +7,7 @@ PV = "1.7+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" |