From patchwork Wed Apr 11 10:27:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 151752 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 98FEFB703B for ; Wed, 11 Apr 2012 20:27:25 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4142925091; Wed, 11 Apr 2012 10:27:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jeQvCuuye0KR; Wed, 11 Apr 2012 10:27:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4858425314; Wed, 11 Apr 2012 10:27:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4C4B38F753 for ; Wed, 11 Apr 2012 10:27:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3BD0E101943 for ; Wed, 11 Apr 2012 10:27:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MJwEVqu6sIer for ; Wed, 11 Apr 2012 10:27:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 124B11017E4 for ; Wed, 11 Apr 2012 10:27:19 +0000 (UTC) Received: by wgbgn7 with SMTP id gn7so626782wgb.21 for ; Wed, 11 Apr 2012 03:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=d7Jc9d4PFXqtXVFKZtOsCHlP4DRKLmyOgTWTWNZFElc=; b=R4upVLn9ee+FzCBcOdZnwwOeD5mBO/xj1lcU489UwsORWq82n3rgwNSiOGJXbXGSb0 TtaVJkb1Ukxei+r3Pp9ADOxq0Pq5lJ01vLAyEeEkauTrmdi4B1GAQqFfw/tYPWhwm7K3 6oiJ6IR7NzAkxaDxidjIZEjh6N1KUoHT+0ilA8LxMVJtuJYlCEf3lYMNzwvtdNkguN0e /+yQNFi/8lvM1aUU7917mKEmv+CIMEXOvmfgwanJZ7KwptRJkHGGLftMyQsp00Wz3Sfq 6rpdrq82hKJPV+Xt8abHSrPKgkyyBcDA++vbB6zKT1EF0pN1jGY45pWK3sUIVEmuWkXz 0z+g== Received: by 10.216.138.17 with SMTP id z17mr8505942wei.18.1334140038137; Wed, 11 Apr 2012 03:27:18 -0700 (PDT) Received: from localhost.localdomain (host-78-150-200-73.as13285.net. [78.150.200.73]) by mx.google.com with ESMTPS id ff2sm8158717wib.9.2012.04.11.03.27.16 (version=SSLv3 cipher=OTHER); Wed, 11 Apr 2012 03:27:17 -0700 (PDT) From: spdawson@gmail.com To: buildroot@uclibc.org Date: Wed, 11 Apr 2012 11:27:11 +0100 Message-Id: <1334140031-29576-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.5.4 Subject: [Buildroot] [PATCH] Patch gpsd-2.95 for avr32 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net gpsd does not compile for avr32, due to use of finite() rather than isfinite(). See, for example, random buildroot test build b7c357dddd7c1f749813035ddbee731d233c59b8 Signed-off-by: Simon Dawson --- package/gpsd/gpsd-2.95-c99-math.patch.avr32 | 53 +++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 package/gpsd/gpsd-2.95-c99-math.patch.avr32 diff --git a/package/gpsd/gpsd-2.95-c99-math.patch.avr32 b/package/gpsd/gpsd-2.95-c99-math.patch.avr32 new file mode 100644 index 0000000..54161d5 --- /dev/null +++ b/package/gpsd/gpsd-2.95-c99-math.patch.avr32 @@ -0,0 +1,53 @@ +Replace calls to finite() with calls to isfinite(), so that gpsd-2.95 will +compile for avr32. + +N.B. It will not be necessary to patch later releases of gpsd, where the +finite() -> isfinite() replacement has already been made. + +Signed-off-by: Simon Dawson +--- + +diff -Nur a/libgpsd_core.c b/libgpsd_core.c +--- a/libgpsd_core.c 2010-06-11 20:45:37.000000000 +0100 ++++ b/libgpsd_core.c 2012-04-11 11:09:42.154508993 +0100 +@@ -545,18 +545,18 @@ + gpsd_report(LOG_DATA, "modeling errors: mode=%d, masks=%s\n", + fix->mode, gpsd_maskdump(session->gpsdata.set)); + if (fix->mode >= MODE_2D) { +- if (isnan(fix->epx) != 0 && finite(session->gpsdata.dop.hdop) != 0) ++ if (isnan(fix->epx) != 0 && isfinite(session->gpsdata.dop.hdop) != 0) + fix->epx = session->gpsdata.dop.xdop * h_uere; + +- if (isnan(fix->epy) != 0 && finite(session->gpsdata.dop.hdop) != 0) ++ if (isnan(fix->epy) != 0 && isfinite(session->gpsdata.dop.hdop) != 0) + fix->epy = session->gpsdata.dop.ydop * h_uere; + + if ((fix->mode >= MODE_3D) +- && isnan(fix->epv) != 0 && finite(session->gpsdata.dop.vdop) != 0) ++ && isnan(fix->epv) != 0 && isfinite(session->gpsdata.dop.vdop) != 0) + fix->epv = session->gpsdata.dop.vdop * v_uere; + + if (isnan(session->gpsdata.epe) != 0 +- && finite(session->gpsdata.dop.pdop) != 0) ++ && isfinite(session->gpsdata.dop.pdop) != 0) + session->gpsdata.epe = session->gpsdata.dop.pdop * p_uere; + else + session->gpsdata.epe = NAN; +diff -Nur a/pseudonmea.c b/pseudonmea.c +--- a/pseudonmea.c 2010-06-02 22:03:02.000000000 +0100 ++++ b/pseudonmea.c 2012-04-11 11:09:58.686508257 +0100 +@@ -215,10 +215,10 @@ + nmea_add_checksum(bufp2); + bufp += strlen(bufp); + } +- if (finite(session->gpsdata.fix.epx) +- && finite(session->gpsdata.fix.epy) +- && finite(session->gpsdata.fix.epv) +- && finite(session->gpsdata.epe)) { ++ if (isfinite(session->gpsdata.fix.epx) ++ && isfinite(session->gpsdata.fix.epy) ++ && isfinite(session->gpsdata.fix.epv) ++ && isfinite(session->gpsdata.epe)) { + struct tm tm; + time_t intfixtime; +