From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-gx0-f175.google.com ([209.85.161.175]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QjmWv-0007bU-5y for openembedded-core@lists.openembedded.org; Thu, 21 Jul 2011 08:14:41 +0200 Received: by gxk3 with SMTP id 3so494595gxk.6 for ; Wed, 20 Jul 2011 23:10:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=rzXU9T2tjEc9FYtEtHDvkXn+GAwoC3IKpbg/eXNb6Go=; b=ABNkUQvqKPgfAA0DyXLopNT7yOAm0jgiS9FuBBHCuGKIeEEHrgXVfMoxbcbHq3qRgx sqpVay37zJ5E7GymXyUOFHPxFey0BAlkli5pHEqzyBzQml45nOZoiVJkYkOozxwz5arn Q2xQBe4UwlyYpgARgODL/XFsaZsw+frW5pXto= Received: by 10.236.189.69 with SMTP id b45mr12846263yhn.293.1311228633090; Wed, 20 Jul 2011 23:10:33 -0700 (PDT) Received: from localhost.localdomain (99-57-141-118.lightspeed.sntcca.sbcglobal.net [99.57.141.118]) by mx.google.com with ESMTPS id f14sm1398877icm.3.2011.07.20.23.10.31 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jul 2011 23:10:32 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 20 Jul 2011 23:10:16 -0700 Message-Id: <1311228617-29732-5-git-send-email-raj.khem@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1311228617-29732-1-git-send-email-raj.khem@gmail.com> References: <1311228617-29732-1-git-send-email-raj.khem@gmail.com> Subject: [PATCH 5/6] strace: Define own sigmask macro if not defined already in signal.h X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2011 06:14:43 -0000 This is required especially on uclibc systems where BSD compatible obsolete functions are disabled by kconfig. Therefore we check if the macro is undefined then we define it. Therefore eglibc/glibc builds should work as they use to. Signed-off-by: Khem Raj --- .../strace/strace-4.5.20/sigmask.patch | 22 ++++++++++++++++++++ meta/recipes-devtools/strace/strace_4.5.20.bb | 6 +++- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch diff --git a/meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch b/meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch new file mode 100644 index 0000000..9bca528 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch @@ -0,0 +1,22 @@ +sigmask is a macro which is dropped if BSD compatibility is +not enabled. So we check if the macro does not exist then +we define it to __sigmask + +Signed-off-by: Khem Raj + +Index: strace-4.5.20/signal.c +=================================================================== +--- strace-4.5.20.orig/signal.c 2010-02-23 13:26:16.000000000 -0800 ++++ strace-4.5.20/signal.c 2011-07-20 23:06:35.842339197 -0700 +@@ -140,6 +140,11 @@ + #endif + #endif /* LINUX */ + ++#if !defined (sigmask) && defined (__sigmask) ++/* Compute mask for signal SIG. */ ++#define sigmask(sig) __sigmask(sig) ++#endif /* sigmask */ ++ + const char *const signalent0[] = { + #include "signalent.h" + }; diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb index 3dba59f..391669f 100644 --- a/meta/recipes-devtools/strace/strace_4.5.20.bb +++ b/meta/recipes-devtools/strace/strace_4.5.20.bb @@ -3,9 +3,11 @@ HOMEPAGE = "http://strace.sourceforge.net" SECTION = "console/utils" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a" -PR = "r1" +PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ + file://sigmask.patch \ + " SRC_URI[md5sum] = "64dfe10d9db0c1e34030891695ffca4b" SRC_URI[sha256sum] = "ea8c059369eaa5ad90b246f34eab247d0ee48bfdee2670c7196320a4669ccabd" -- 1.7.4.1