summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-26 21:50:11 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-05-26 21:50:11 (GMT)
commite13ac0ec8788092c6508636da94fe0198c18dffd (patch)
tree0d1061604f4f7031b00fe74fd7e7d0707f037ec5
parent50685f1ce37be8bcd38b73ae3470516e9afb2033 (diff)
downloadbuildroot-e13ac0ec8788092c6508636da94fe0198c18dffd.tar.gz
buildroot-e13ac0ec8788092c6508636da94fe0198c18dffd.tar.bz2
iperf: override bool detection
The configure script contains a buggy test for the bool datatype and it's size. This is normally not a big deal as the result isn't used for anything, but when BR2_CONFIG_CACHE (default) is used, the wrong ac_cv_type_bool result is stored in the cache, and other packages like libcurl DO need the bool type, so that breaks the build. Fix it by presetting those tests to sane values. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/iperf/iperf.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 6dcf97c..af73187 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@
Updated/fixed packages: aumix, atk, avahi, bmon, busybox, cairo,
cdrkit, dbus-glib, dbus-python, docker, enchant, fltk, gamin,
gettext, gmpc, gob2, grep, gstreamer, gst-plugins-bad,
- gst-plugins-base, gvfs, hal, iconv, icu, libcgicc, libdvdnav,
+ gst-plugins-base, gvfs, hal, iconv, icu, iperf, libcgicc, libdvdnav,
libdvdread, libglade, libglib2, libgtk2, libidn, libmms,
libmpd, libpcap, libsoup, lmbench, lsof, ltrace, lvm2, make,
metacity, mtd-utils, mutt, nbd, netsnmp, ntfsprogs, ntp, olsr,
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index 10e5a37..3f8e3fc 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -14,7 +14,9 @@ IPERF_INSTALL_STAGING = NO
IPERF_INSTALL_TARGET = YES
IPERF_CONF_ENV = \
- ac_cv_func_malloc_0_nonnull=yes
+ ac_cv_func_malloc_0_nonnull=yes \
+ ac_cv_type_bool=yes \
+ ac_cv_sizeof_bool=1
IPERF_CONF_OPT = \
--disable-dependency-tracking \