X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=222befe8a5e178aeee586d956ee79b6f7ac1e87e;hp=880d113d932125e115da565fe092fb1a2788595c;hb=d7213923067aa49922962a469a691c3ec951064d;hpb=95820b6e6c92025df8d89c0bf39b174e53137c41 diff --git a/configure b/configure index 880d113d..222befe8 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() { @@ -80,7 +87,7 @@ compile_object() { compile_prog() { local_cflags="$1" - local_ldflags="$2" + local_ldflags="$2 $LIBS" echo "Compiling test case $3" >> config.log do_cc $CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags } @@ -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() { @@ -120,6 +126,7 @@ output_sym() { targetos="" cpu="" +cross_prefix=${cross_prefix-${CROSS_COMPILE}} cc="${CC-${cross_prefix}gcc}" # default options @@ -131,15 +138,17 @@ gfio="no" for opt do optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'` case "$opt" in - --cc=*) - CC="$optarg" - ;; - --extra-cflags=*) - CFLAGS="$CFLAGS $optarg" + --cpu=*) cpu="$optarg" + ;; + --cc=*) CC="$optarg" + ;; + --extra-cflags=*) CFLAGS="$CFLAGS $optarg" + ;; + --build-32bit-win=*) build_32bit_win="$optarg" ;; --enable-gfio) - gfio="yes" - ;; + gfio="yes" + ;; --help) show_help="yes" ;; @@ -151,13 +160,17 @@ for opt do done if test "$show_help" = "yes" ; then - echo "--cc= Specify compiler to use" + 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 "--enable-gfio Enable building of gtk gfio" - exit $exit_val + echo "--build-32bit-win= Specify yes for a 32-bit build on Windows" + echo "--enable-gfio Enable building of gtk gfio" + exit $exit_val fi -if check_define __linux__ ; then +if check_define __ANDROID__ ; then + targetos="Android" +elif check_define __linux__ ; then targetos="Linux" elif check_define __OpenBSD__ ; then targetos='OpenBSD' @@ -167,6 +180,12 @@ else targetos=`uname -s` fi +echo "# Automatically generated by configure - do not modify" > $config_host_mak +printf "# Configured with:" >> $config_host_mak +printf " '%s'" "$0" "$@" >> $config_host_mak +echo >> $config_host_mak +echo "CONFIG_TARGET_OS=$targetos" >> $config_host_mak + # Some host OSes need non-standard checks for which CPU to use. # Note that these checks are broken for cross-compilation: if you're # cross-compiling to one of these OSes then you'll need to specify @@ -187,25 +206,31 @@ SunOS) if test -z "$cpu" && test "$(isainfo -k)" = "amd64"; then cpu="x86_64" fi + LIBS="-lnsl -lsocket" ;; 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" @@ -213,6 +238,7 @@ CYGWIN*) echo "CC=$CC" >> $config_host_mak echo "EXTFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak exit 0 + ;; esac if test ! -z "$cpu" ; then @@ -276,8 +302,7 @@ case "$cpu" in cpu="sparc" ;; *) - echo "Unknown CPU" - exit 1; + echo "Unknown CPU" ;; esac @@ -293,10 +318,27 @@ fi cc="${CC-${cross_prefix}gcc}" +########################################## +# check cross compile + +cross_compile="no" +cat > $TMPC </dev/null || cross_compile="yes" +else + fatal "compile test failed" +fi + ########################################## # check endianness bigendian="no" -cat > $TMPC < $TMPC < int main(void) { @@ -304,8 +346,24 @@ int main(void) return (*((uint8_t*)(&i))) == 0x67; } EOF -if compile_prog "" "" "endian"; then - $TMPE && bigendian="yes" + if compile_prog "" "" "endian"; then + $TMPE && bigendian="yes" + fi +else + # If we're cross compiling, try our best to work it out and rely on the + # run-time check to fail if we get it wrong. + cat > $TMPC < +int main(void) +{ +#if __BYTE_ORDER != __BIG_ENDIAN +# error "Unknown endianness" +#endif +} +EOF + compile_prog "" "" "endian" && bigendian="yes" + check_define "__ARMEB__" && bigendian="yes" + check_define "__MIPSEB__" && bigendian="yes" fi @@ -313,22 +371,27 @@ echo "Operating system $targetos" echo "CPU $cpu" echo "Big endian $bigendian" echo "Compiler $cc" +echo "Cross compile $cross_compile" echo ########################################## # check for wordsize wordsize="0" cat > $TMPC < +#include +#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) int main(void) { - unsigned int wsize = sizeof(long) * 8; - printf("%d\n", wsize); + BUILD_BUG_ON(sizeof(long)*CHAR_BIT != WORDSIZE); return 0; } EOF -if compile_prog "" "" "wordsize"; then - wordsize=$($TMPE) +if compile_prog "-DWORDSIZE=32" "" "wordsize"; then + wordsize="32" +elif compile_prog "-DWORDSIZE=64" "" "wordsize"; then + wordsize="64" +else + fatal "Unknown wordsize" fi echo "Wordsize $wordsize" @@ -424,7 +487,7 @@ sfaa="no" cat > $TMPC << EOF static int sfaa(int *ptr) { - return __sync_fetch_and_and(ptr, 0); + return __sync_fetch_and_add(ptr, 0); } int main(int argc, char **argv) @@ -437,7 +500,7 @@ EOF if compile_prog "" "" "__sync_fetch_and_add()" ; then sfaa="yes" fi -echo "__sync_fetch_and add $sfaa" +echo "__sync_fetch_and_add $sfaa" ########################################## # libverbs probe @@ -807,8 +870,7 @@ echo "inet_aton $inet_aton" # socklen_t probe socklen_t="no" cat > $TMPC << EOF -#include -#include +#include int main(int argc, char **argv) { socklen_t len = 0; @@ -846,9 +908,9 @@ if test "$gfio" = "yes" ; then int main(void) { gdk_threads_enter(); - gtk_main(); gdk_threads_leave(); - return 0; + + printf("%d", GTK_CHECK_VERSION(2, 18, 0)); } EOF GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0) @@ -861,10 +923,16 @@ if test "$?" != "0" ; then echo "configure: gtk and gthread not found" exit 1 fi -if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio"; then - gfio="yes" - LIBS="$LIBS $GTK_LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" +if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then + r=$($TMPE) + if test "$r" != "0" ; then + gfio="yes" + LIBS="$LIBS $GTK_LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + else + echo "GTK found, but need version 2.18 or higher" + gfio="no" + fi else echo "Please install gtk and gdk libraries" gfio="no" @@ -924,20 +992,31 @@ if compile_prog "" "" "TCP_NODELAY"; then 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 -printf "# Configured with:" >> $config_host_mak -printf " '%s'" "$0" "$@" >> $config_host_mak -echo >> $config_host_mak +############################################################################# if test "$wordsize" = "64" ; then output_sym "CONFIG_64BIT" 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" @@ -1036,6 +1115,9 @@ 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 "CFLAGS+=$CFLAGS" >> $config_host_mak