aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-10-28 09:58:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-10-28 10:00:00 +0000
commit496501fa630a848b15f8e92d34d0ba80a11a01cf (patch)
treebdc71624bad321f9c7940b9e3aea8a9a61c74839
parentea3ce4390ea88dd4dac6ccf0b8c7cbfe066abba8 (diff)
downloadaports-496501fa630a848b15f8e92d34d0ba80a11a01cf.tar.bz2
aports-496501fa630a848b15f8e92d34d0ba80a11a01cf.tar.xz
main/coova-chilli: build fix for sysinfo redeclaration
http://lists.coova.org/pipermail/chilli/2013-August/002347.html
-rw-r--r--main/coova-chilli/100-fix-sysinfo-redeclaration.patch24
-rw-r--r--main/coova-chilli/APKBUILD17
2 files changed, 35 insertions, 6 deletions
diff --git a/main/coova-chilli/100-fix-sysinfo-redeclaration.patch b/main/coova-chilli/100-fix-sysinfo-redeclaration.patch
new file mode 100644
index 0000000000..446eb63ced
--- /dev/null
+++ b/main/coova-chilli/100-fix-sysinfo-redeclaration.patch
@@ -0,0 +1,24 @@
+--- a/src/system.h
++++ b/src/system.h
+@@ -76,10 +76,6 @@
+ #include <sys/stat.h>
+ #endif
+
+-#ifdef HAVE_SYS_SYSINFO_H
+-#include <sys/sysinfo.h>
+-#endif
+-
+ #ifdef HAVE_TIME_H
+ #include <time.h>
+ #endif
+@@ -132,6 +128,10 @@
+ #include <linux/un.h>
+ #endif
+
++#ifdef HAVE_SYS_SYSINFO_H
++#include <sys/sysinfo.h>
++#endif
++
+ #elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
+ #include <net/if.h>
+ #include <net/bpf.h>
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index 388835f021..428d9db775 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=coova-chilli
pkgver=1.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
url="http://www.coova.org/"
arch="all"
@@ -14,7 +14,9 @@ pkgusers="chilli"
pkggroups="chilli"
subpackages="$pkgname-doc $pkgname-dev"
source="http://ap.coova.org/chilli/coova-chilli-$pkgver.tar.gz
- automake.patch"
+ automake.patch
+ 100-fix-sysinfo-redeclaration.patch
+ "
_builddir="$srcdir/$pkgname-$pkgver"
@@ -64,7 +66,7 @@ build() {
--enable-curl \
--enable-largelimits \
|| return 1
-
+
export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
make -j1 || return 1
}
@@ -80,8 +82,11 @@ package() {
}
md5sums="dc0037e3cdebcb60508081b4e42e984a coova-chilli-1.3.0.tar.gz
-b3aaf43bcdb5cfbf39d1c730d1de1a3b automake.patch"
+b3aaf43bcdb5cfbf39d1c730d1de1a3b automake.patch
+e1d1a4c5573330e40a651cd2d7c027e7 100-fix-sysinfo-redeclaration.patch"
sha256sums="ca24ac274340c65a8e7ff704e6866a04380a87c444f261ba84097f0bd1c162e8 coova-chilli-1.3.0.tar.gz
-16f529c7deee24155bd900a3f64fc110207d435ad12bd91e71823acd6156ab25 automake.patch"
+16f529c7deee24155bd900a3f64fc110207d435ad12bd91e71823acd6156ab25 automake.patch
+8da92965f81761c6e90b6dacd0cc1003caa013b8967b81f297baefc708dd58a9 100-fix-sysinfo-redeclaration.patch"
sha512sums="40dd77a6fb2877f46b0d6e84cfba9507dfac0999f6aff45d3a28bb64fd044b707cfeacd06d4bd411669e3a47cdc5ec14dbf79effee235174fbbf0b88c30015b3 coova-chilli-1.3.0.tar.gz
-643b99f473753881f15e8b049ae1e071a8fe6164fd92b30a54ad27a0a8b58d26727ab82d28b587defc1f28f4213c64d298bf707b9bf6a3a98013578b26a79733 automake.patch"
+643b99f473753881f15e8b049ae1e071a8fe6164fd92b30a54ad27a0a8b58d26727ab82d28b587defc1f28f4213c64d298bf707b9bf6a3a98013578b26a79733 automake.patch
+a87d179fd08f2e96aee327c131503e646697e6d75f8e75ff6a901d60ef4f958e495816b5ed7ee1946ba3d9bb5047bdc955c71943068c47c63fcf415d4a2b1df9 100-fix-sysinfo-redeclaration.patch"