From patchwork Thu Apr 25 20:07:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 239590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id DF52D2C00BD for ; Fri, 26 Apr 2013 06:08:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B2A6EA0146; Thu, 25 Apr 2013 20:08:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BLp4OzZcUdOB; Thu, 25 Apr 2013 20:08:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F04AA0155; Thu, 25 Apr 2013 20:08:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 548AF8F753 for ; Thu, 25 Apr 2013 20:08:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DF9D08D3DE for ; Thu, 25 Apr 2013 20:08:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4QVEcWWGcWdk for ; Thu, 25 Apr 2013 20:08:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id 395D58D413 for ; Thu, 25 Apr 2013 20:08:11 +0000 (UTC) Received: by mail-wi0-f174.google.com with SMTP id m6so9140930wiv.7 for ; Thu, 25 Apr 2013 13:08:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=Hl0XTXHtV+UIENektOZvKXqBWNhnwM5iCgDLHHoooKA=; b=HAGFD1oG6WcHNgUu+O6RsDgBahkqGZM6KY2brBYRdilJKTrAPLIDqDpUyI5WG+ZrN5 Ql1cY0am8uGNDHsJJRO+8upXXMv5+KV620FtJbdKq9UcRu0kYwt0ep2m6hFymlzMfpPx XOjk9xxZEIOi99J9LYvg31vgBdY5mFAKj6kNZ8/qAIm3nNthTjpKfw2UlGJaZSWCOCeL bgeV7rvgMZCZUTIWWl6lYBhq2bLPykuWDByoFzzYYmK1ZOT/dZl/dVe/HVmOnqU1fnNX ju1F7NjYZMl9zOjmPgQBFCYTwgFtZTAXt29w3k1LtJLw4em+ibkqQan1updViv1+btQK uHxg== X-Received: by 10.194.93.68 with SMTP id cs4mr30828489wjb.17.1366920488974; Thu, 25 Apr 2013 13:08:08 -0700 (PDT) Received: from localhost.localdomain (88-105-224-149.dynamic.dsl.as9105.com. [88.105.224.149]) by mx.google.com with ESMTPSA id a9sm2949223wiv.0.2013.04.25.13.08.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 13:08:08 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Thu, 25 Apr 2013 21:07:02 +0100 Message-Id: <1366920422-21956-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH v2 2/2] wvdial: new package 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 From: Simon Dawson Signed-off-by: Simon Dawson --- v2: Improve in response to suggestions from Thomas Petazzoni package/Config.in | 1 + package/wvdial/Config.in | 9 +++++ package/wvdial/wvdial-0001-uClibc-scandir.patch | 23 +++++++++++++ package/wvdial/wvdial.mk | 42 +++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 package/wvdial/Config.in create mode 100644 package/wvdial/wvdial-0001-uClibc-scandir.patch create mode 100644 package/wvdial/wvdial.mk diff --git a/package/Config.in b/package/Config.in index 33d75a9..84a92e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -777,6 +777,7 @@ source "package/wireless-regdb/Config.in" source "package/wireless_tools/Config.in" source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" +source "package/wvdial/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in" diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in new file mode 100644 index 0000000..2dc93ab --- /dev/null +++ b/package/wvdial/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_WVDIAL + bool "wvdial" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # wvstreams + select BR2_PACKAGE_WVSTREAMS + help + wvdial with support for software flow control and asyncmaps. + + http://wvdial.googlecode.com/ diff --git a/package/wvdial/wvdial-0001-uClibc-scandir.patch b/package/wvdial/wvdial-0001-uClibc-scandir.patch new file mode 100644 index 0000000..b611e94 --- /dev/null +++ b/package/wvdial/wvdial-0001-uClibc-scandir.patch @@ -0,0 +1,23 @@ +Fix wvdial so that it works with scandir as defined in uClibc. + +Signed-off-by: Simon Dawson + +diff -Nurp a/wvmodemscan.cc b/wvmodemscan.cc +--- a/wvmodemscan.cc 2009-09-29 18:27:28.000000000 +0100 ++++ b/wvmodemscan.cc 2012-07-28 14:03:56.359729660 +0100 +@@ -495,13 +495,13 @@ static int fileselect(const struct diren + // (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4); + } + +-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 10) ++#if defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) + static int filesort(const dirent **e1, const dirent **e2) + #else + static int filesort(const void *_e1, const void *_e2) + #endif + { +-#if !(defined(__GLIBC__) && __GLIBC_PREREQ(2, 10)) ++#if !(defined(__UCLIBC__) || (defined(__GLIBC__) && __GLIBC_PREREQ(2, 10))) + dirent const * const *e1 = (dirent const * const *)_e1; + dirent const * const *e2 = (dirent const * const *)_e2; + #endif diff --git a/package/wvdial/wvdial.mk b/package/wvdial/wvdial.mk new file mode 100644 index 0000000..89888d4 --- /dev/null +++ b/package/wvdial/wvdial.mk @@ -0,0 +1,42 @@ +############################################################# +# +# wvdial +# +############################################################# + +WVDIAL_VERSION = 1.61 +WVDIAL_SITE = http://wvdial.googlecode.com/files +WVDIAL_SOURCE = wvdial-$(WVDIAL_VERSION).tar.bz2 +WVDIAL_DEPENDENCIES = wvstreams + +WVDIAL_LICENSE = LGPLv2 +WVDIAL_LICENSE_FILES = COPYING.LIB + +# N.B. parallel make fails +WVDIAL_MAKE = $(MAKE1) + +WVDIAL_MAKE_ENV += $(TARGET_CONFIGURE_OPTS) \ + WVSTREAMS_INC="$(STAGING_DIR)/usr/include" \ + WVSTREAMS_LIB="$(STAGING_DIR)/usr/lib" + +define WVDIAL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) -C $(@D) +endef + +define WVDIAL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \ + prefix="$(TARGET_DIR)/usr" PPPDIR="$(TARGET_DIR)/etc/ppp/peers" \ + install -C $(@D) +endef + +define WVDIAL_UNINSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \ + prefix="$(TARGET_DIR)/usr" PPPDIR="$(TARGET_DIR)/etc/ppp/peers" \ + uninstall -C $(@D) +endef + +define WVDIAL_CLEAN_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) clean -C $(@D) +endef + +$(eval $(generic-package))