X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=8f8674980df1318ba59b76c9bffebd486dc9df11;hp=4402f3a41d4fb3ec2b0064cf13db2a2c3b4b16dc;hb=7366ad05740d4cbbe5b43daa3b9b9efe74df34b3;hpb=208e4c8bcd943b356834541c0b4d08710f348edb diff --git a/configure b/configure index 4402f3a4..8f867498 100755 --- a/configure +++ b/configure @@ -29,6 +29,14 @@ config_host_h="config-host.h" rm -rf $config_host_mak rm -rf $config_host_h +fatal() { + echo $@ + echo "Configure failed, check config.log and/or the above output" + rm -rf $config_host_mak + rm -rf $config_host_h + exit 1 +} + # Default CFLAGS CFLAGS="-D_GNU_SOURCE" EXTFLAGS="-include config-host.h" @@ -70,8 +78,7 @@ do_cc() { echo "ERROR: configure test passed without -Werror but failed with -Werror." echo "This is probably a bug in the configure script. The failing command" echo "will be at the bottom of config.log." - echo "You can run configure with --disable-werror to bypass this check." - exit 1 + fatal "You can run configure with --disable-werror to bypass this check." } compile_object() { @@ -91,8 +98,7 @@ feature_not_found() { echo "ERROR" echo "ERROR: User requested feature $feature" echo "ERROR: configure was not able to find it" - echo "ERROR" - exit 1; + fatal "ERROR" } has() { @@ -122,21 +128,42 @@ cpu="" cc="${CC-${cross_prefix}gcc}" +show_help="no" +exit_val=0 + # parse options for opt do optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'` case "$opt" in + --cpu=*) cpu="$optarg" + ;; --cc=*) CC="$optarg" ;; --extra-cflags=*) CFLAGS="$CFLAGS $optarg" ;; + --build-32bit-win=*) build_32bit_win="$optarg" + ;; + --help) + show_help="yes" + ;; *) echo "Bad option $opt" - exit 1 + show_help="yes" + exit_val=1 esac done -if check_define __linux__ ; then +if test "$show_help" = "yes" ; then + echo "--cpu= Specify target CPU if auto-detect fails" + echo "--cc= Specify compiler to use" + echo "--extra-cflags= Specify extra CFLAGS to pass to compiler" + echo "--build-32bit-win= Specify yes for a 32-bit build on Windows" + exit $exit_val +fi + +if check_define __ANDROID__ ; then + targetos="Android" +elif check_define __linux__ ; then targetos="Linux" elif check_define __OpenBSD__ ; then targetos='OpenBSD' @@ -170,25 +197,43 @@ SunOS) CYGWIN*) echo "Forcing known good options on Windows" if test -z "$CC" ; then - CC="x86_64-w64-mingw32-gcc" + if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then + CC="i686-w64-mingw32-gcc" + else + CC="x86_64-w64-mingw32-gcc" + fi fi output_sym "CONFIG_LITTLE_ENDIAN" - output_sym "CONFIG_64BIT_LLP64" - output_sym "CONFIG_CLOCK_GETTIME" - output_sym "CONFIG_CLOCK_MONOTONIC" - output_sym "CONFIG_GETTIMEOFDAY" + if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then + output_sym "CONFIG_32BIT" + else + output_sym "CONFIG_64BIT_LLP64" + fi output_sym "CONFIG_FADVISE" output_sym "CONFIG_SOCKLEN_T" - output_sym "CONFIG_POSIX_FALLOCATE" output_sym "CONFIG_FADVISE" output_sym "CONFIG_SFAA" output_sym "CONFIG_RUSAGE_THREAD" output_sym "CONFIG_WINDOWSAIO" output_sym "CONFIG_FDATASYNC" + output_sym "CONFIG_CLOCK_MONOTONIC" output_sym "CONFIG_GETTIMEOFDAY" output_sym "CONFIG_CLOCK_GETTIME" + output_sym "CONFIG_SCHED_IDLE" + output_sym "CONFIG_TCP_NODELAY" echo "CC=$CC" >> $config_host_mak - echo "EXTFLAGS=-include config-host.h -D_GNU_SOURCE" >> $config_host_mak + echo "EXTFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak + exit 0 + ;; +Android) + output_sym "CONFIG_32BIT" + output_sym "CONFIG_LITTLE_ENDIAN" + output_sym "CONFIG_SOCKLEN_T" + output_sym "CONFIG_GETTIMEOFDAY" + output_sym "CONFIG_CLOCK_GETTIME" + output_sym "CONFIG_CLOCK_MONOTONIC" + echo "CC=$cc" >> $config_host_mak + echo "EXTFLAGS=$CFLAGS -include config-host.h -DFIO_NO_HAVE_SHM_H -D_GNU_SOURCE" >> $config_host_mak exit 0 esac @@ -253,8 +298,7 @@ case "$cpu" in cpu="sparc" ;; *) - echo "Unknown CPU" - exit 1; + echo "Unknown CPU" ;; esac @@ -305,7 +349,7 @@ int main(void) } EOF if compile_prog "" "" "wordsize"; then - wordsize=$($TMPE) + wordsize=`$TMPE` fi echo "Wordsize $wordsize" @@ -831,6 +875,60 @@ if compile_prog "" "" "RUSAGE_THREAD"; then fi echo "RUSAGE_THREAD $rusage_thread" +########################################## +# Check whether we have SCHED_IDLE +sched_idle="no" +cat > $TMPC << EOF +#include +int main(int argc, char **argv) +{ + struct sched_param p; + return sched_setscheduler(0, SCHED_IDLE, &p); +} +EOF +if compile_prog "" "" "SCHED_IDLE"; then + sched_idle="yes" +fi +echo "SCHED_IDLE $sched_idle" + +########################################## +# Check whether we have TCP_NODELAY +tcp_nodelay="no" +cat > $TMPC << EOF +#include +#include +#include +#include +int main(int argc, char **argv) +{ + return getsockopt(0, 0, TCP_NODELAY, NULL, NULL); +} +EOF +if compile_prog "" "" "TCP_NODELAY"; then + tcp_nodelay="yes" +elif compile_prog "" "-lnsl -lsocket" "TCP_NODELAY"; then + tcp_nodelay="yes" + LIBS="-lnsl -lsocket $LIBS" +fi +echo "TCP_NODELAY $tcp_nodelay" + +########################################## +# Check whether we have RLIMIT_MEMLOCK +rlimit_memlock="no" +cat > $TMPC << EOF +#include +#include +int main(int argc, char **argv) +{ + struct rlimit rl; + return getrlimit(RLIMIT_MEMLOCK, &rl); +} +EOF +if compile_prog "" "" "RLIMIT_MEMLOCK"; then + rlimit_memlock="yes" +fi +echo "RLIMIT_MEMLOCK $rlimit_memlock" + ############################################################################# echo "# Automatically generated by configure - do not modify" > $config_host_mak @@ -843,8 +941,7 @@ if test "$wordsize" = "64" ; then elif test "$wordsize" = "32" ; then output_sym "CONFIG_32BIT" else - echo "Unknown wordsize!" - exit 1 + fatal "Unknown wordsize!" fi if test "$bigendian" = "yes" ; then output_sym "CONFIG_BIG_ENDIAN" @@ -934,6 +1031,15 @@ fi if test "$rusage_thread" = "yes" ; then output_sym "CONFIG_RUSAGE_THREAD" fi +if test "$sched_idle" = "yes" ; then + output_sym "CONFIG_SCHED_IDLE" +fi +if test "$tcp_nodelay" = "yes" ; then + output_sym "CONFIG_TCP_NODELAY" +fi +if test "$rlimit_memlock" = "yes" ; then + output_sym "CONFIG_RLIMIT_MEMLOCK" +fi echo "LIBS+=$LIBS" >> $config_host_mak echo "CC=$cc" >> $config_host_mak