From patchwork Thu Apr 25 09:19: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: 239439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 96A192C0106 for ; Thu, 25 Apr 2013 19:19:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D2C8F101BC4; Thu, 25 Apr 2013 09:19:22 +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 aQJ16KLr8NBd; Thu, 25 Apr 2013 09:19:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F128B10BAC1; Thu, 25 Apr 2013 09:19:01 +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 31D058F74B for ; Thu, 25 Apr 2013 09:19:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 307A5851A5 for ; Thu, 25 Apr 2013 09:19:15 +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 f433C-dsEHvn for ; Thu, 25 Apr 2013 09:19:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id DDECE85C8E for ; Thu, 25 Apr 2013 09:19:10 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id c10so3099699wiw.14 for ; Thu, 25 Apr 2013 02:19: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:in-reply-to :references; bh=CuZb0SgodJr1+lsXf1FEA057oTPQGnZraps3d3jyhXc=; b=eQTbp4W7Mxh0Ffzaa2OJJfQdZ2z7eotPxR2723X7o+nClEwTiBVwUI2IoG4FS4d2OT YTLbr7Ujm47erXgAoXYZmftfShGYdv9feYfFAc051++kksfe4Bh0U7OnLDRoabWiTRZa m61P4ARBhXq/iP8qLU280i3oQnc3BNGhqBTSpR0JGD5OAiLSuAb/CycAGyrfZre1J9Zm hZCnEPVZVZcfDV1BKUCEteaAg/CQoByefbNNjrsmUv/gWgJwPlrMdE2FA0jstSCBwTWJ oY9fg/YdNMhJpCCZruH5fQPyqN53bW3rE3UQyUMHh0ZCdOI4zICWfUuTaUDSYcCNDQ6B PATg== X-Received: by 10.180.182.110 with SMTP id ed14mr70618353wic.6.1366881549586; Thu, 25 Apr 2013 02:19:09 -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 q13sm9443928wie.8.2013.04.25.02.19.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Apr 2013 02:19:08 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Thu, 25 Apr 2013 10:19:02 +0100 Message-Id: <1366881542-15350-3-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366881542-15350-1-git-send-email-spdawson@gmail.com> References: <1366881542-15350-1-git-send-email-spdawson@gmail.com> Subject: [Buildroot] [PATCH 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 --- package/Config.in | 1 + package/wvdial/Config.in | 9 +++++ .../wvdial/wvdial-0001-ppp-install-prefix.patch | 16 ++++++++ package/wvdial/wvdial-0002-uClibc-scandir.patch | 23 +++++++++++ package/wvdial/wvdial.mk | 41 ++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 package/wvdial/Config.in create mode 100644 package/wvdial/wvdial-0001-ppp-install-prefix.patch create mode 100644 package/wvdial/wvdial-0002-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-ppp-install-prefix.patch b/package/wvdial/wvdial-0001-ppp-install-prefix.patch new file mode 100644 index 0000000..5db9648 --- /dev/null +++ b/package/wvdial/wvdial-0001-ppp-install-prefix.patch @@ -0,0 +1,16 @@ +Fix install prefix for PPP configuration files. + +Signed-off-by: Simon Dawson + +diff -Nurp a/Makefile b/Makefile +--- a/Makefile 2011-08-04 20:30:52.000000000 +0100 ++++ b/Makefile 2013-04-25 09:11:36.916376367 +0100 +@@ -23,7 +23,7 @@ LIBS+=$(PC_LIBS) + + BINDIR=${prefix}/bin + MANDIR=${prefix}/share/man +-PPPDIR=/etc/ppp/peers ++PPPDIR=${prefix}/etc/ppp/peers + + include wvrules.mk + diff --git a/package/wvdial/wvdial-0002-uClibc-scandir.patch b/package/wvdial/wvdial-0002-uClibc-scandir.patch new file mode 100644 index 0000000..b611e94 --- /dev/null +++ b/package/wvdial/wvdial-0002-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..8537813 --- /dev/null +++ b/package/wvdial/wvdial.mk @@ -0,0 +1,41 @@ +############################################################# +# +# 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 += \ + CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" WVSTREAMS="$(WVSTREAMS_DIR)" +WVDIAL_INSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" install +WVDIAL_UNINSTALL_TARGET_OPT += prefix="$(TARGET_DIR)/usr" uninstall + +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) \ + $(WVDIAL_INSTALL_TARGET_OPT) -C $(@D) +endef + +define WVDIAL_UNINSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) \ + $(WVDIAL_UNINSTALL_TARGET_OPT) -C $(@D) +endef + +define WVDIAL_CLEAN_CMDS + $(TARGET_MAKE_ENV) $(WVDIAL_MAKE_ENV) $(WVDIAL_MAKE) clean -C $(@D) +endef + +$(eval $(generic-package))