From patchwork Fri Aug 29 12:30:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kim_B=C3=B8ndergaard?= X-Patchwork-Id: 384217 X-Patchwork-Delegate: kiho@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 10B1F14012F for ; Fri, 29 Aug 2014 22:31:02 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id EA8063FCCE for ; Fri, 29 Aug 2014 14:30:59 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id DC4603FCCE for ; Fri, 29 Aug 2014 14:30:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=3910; q=dns/txt; s=ironport2; t=1409315458; x=1440851458; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=hFjJmUPmGfkLmoLkOlqr29PFaNe7uq99sBhOvBGUq/A=; b=DUJgzsPucL22Fxrto47GrRNbnfQyptto0/TrVs7E22G4LKsfaUS2cJQP BUSB3bTybJmtIdCPFOR755jEJd4J6Lv5aX1zE4nusKaHWJLCy4Ph2Juyi 2Ysbd0vVkzRDU+efKo0XHGBqTVWiwIuQREQRFWiwsWnFDh+8cKjcdInAn s=; X-IronPort-AV: E=Sophos;i="5.04,424,1406584800"; d="scan'208";a="1010598" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 29 Aug 2014 14:30:58 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Fri, 29 Aug 2014 14:30:57 +0200 Received: by localhost (Postfix, from userid 30019) id EB6DD681678; Fri, 29 Aug 2014 12:30:56 +0000 (UTC) From: =?UTF-8?q?Kim=20B=C3=B8ndergaard?= To: Subject: [PATCH 1/6] dbus: Add configure check for mq_getattr in librt Date: Fri, 29 Aug 2014 12:30:50 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 Cc: Esben Haabendal X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Esben Haabendal Signed-off-by: Esben Haabendal --- .../dbus-1.7.0/dbus-configure-mq_getattr.patch | 87 ++++++++++++++++++++++ recipes/dbus/dbus_1.7.10.oe | 1 + 2 files changed, 88 insertions(+) create mode 100644 recipes/dbus/dbus-1.7.0/dbus-configure-mq_getattr.patch diff --git a/recipes/dbus/dbus-1.7.0/dbus-configure-mq_getattr.patch b/recipes/dbus/dbus-1.7.0/dbus-configure-mq_getattr.patch new file mode 100644 index 0000000..e0de1a4 --- /dev/null +++ b/recipes/dbus/dbus-1.7.0/dbus-configure-mq_getattr.patch @@ -0,0 +1,87 @@ +diff -U 5 dbus~orig/configure dbus/configure +--- dbus~orig/configure 2014-03-05 14:57:28.550768162 +0100 ++++ dbus/configure 2014-03-05 14:57:28.549768148 +0100 +@@ -19741,10 +19741,67 @@ + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + THREAD_LIBS="$LIBS" + fi + + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing mq_getattr" >&5 ++$as_echo_n "checking for library containing mq_getattr... " >&6; } ++if ${ac_cv_search_mq_getattr+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char mq_getattr (); ++int ++main () ++{ ++return mq_getattr (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' rt; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_mq_getattr=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if ${ac_cv_search_mq_getattr+:} false; then : ++ break ++fi ++done ++if ${ac_cv_search_mq_getattr+:} false; then : ++ ++else ++ ac_cv_search_mq_getattr=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_mq_getattr" >&5 ++$as_echo "$ac_cv_search_mq_getattr" >&6; } ++ac_res=$ac_cv_search_mq_getattr ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ THREAD_LIBS="$LIBS" ++fi ++ ++ + if test "x$ac_cv_search_pthread_condattr_setclock" != xno; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_getres" >&5 + $as_echo_n "checking for library containing clock_getres... " >&6; } + if ${ac_cv_search_clock_getres+:} false; then : +diff -U 5 dbus~orig/configure.ac dbus/configure.ac +--- dbus~orig/configure.ac 2014-03-05 14:57:28.549768148 +0100 ++++ dbus/configure.ac 2014-03-05 14:57:28.549768148 +0100 +@@ -949,10 +949,12 @@ + # is non-fatal if we don't find it. + AC_SEARCH_LIBS([pthread_condattr_setclock], + [pthread], + [THREAD_LIBS="$LIBS"]) + ++ AC_SEARCH_LIBS([mq_getattr], [rt], [THREAD_LIBS="$LIBS"]) ++ + AS_IF([test "x$ac_cv_search_pthread_condattr_setclock" != xno], + [ + AC_SEARCH_LIBS([clock_getres], [rt], [THREAD_LIBS="$LIBS"]) + AC_MSG_CHECKING([for CLOCK_MONOTONIC]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( diff --git a/recipes/dbus/dbus_1.7.10.oe b/recipes/dbus/dbus_1.7.10.oe index 2fa5020..b556d3f 100644 --- a/recipes/dbus/dbus_1.7.10.oe +++ b/recipes/dbus/dbus_1.7.10.oe @@ -2,6 +2,7 @@ include dbus.inc SRC_URI += "file://tmpdir.patch" +SRC_URI += "file://dbus-configure-mq_getattr.patch" SRC_URI:>HOST_LIBC_mingw = " file://libtool-bindir.patch" export sharedlibdir