X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=222befe8a5e178aeee586d956ee79b6f7ac1e87e;hp=caaf30e05608adfe1e48a2b872ed816ac36a175c;hb=d7213923067aa49922962a469a691c3ec951064d;hpb=1e72a886a3eb4d27a5a2c3d6706a1a6a0d10023a diff --git a/configure b/configure index caaf30e0..222befe8 100755 --- a/configure +++ b/configure @@ -87,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 } @@ -126,10 +126,13 @@ output_sym() { targetos="" cpu="" +cross_prefix=${cross_prefix-${CROSS_COMPILE}} cc="${CC-${cross_prefix}gcc}" +# default options show_help="no" exit_val=0 +gfio="no" # parse options for opt do @@ -143,9 +146,12 @@ for opt do ;; --build-32bit-win=*) build_32bit_win="$optarg" ;; - --help) - show_help="yes" + --enable-gfio) + gfio="yes" ;; + --help) + show_help="yes" + ;; *) echo "Bad option $opt" show_help="yes" @@ -158,6 +164,7 @@ if test "$show_help" = "yes" ; then 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" + echo "--enable-gfio Enable building of gtk gfio" exit $exit_val fi @@ -173,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 @@ -193,6 +206,7 @@ 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" @@ -225,16 +239,6 @@ CYGWIN*) 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 if test ! -z "$cpu" ; then @@ -314,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) { @@ -325,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 @@ -334,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" @@ -445,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) @@ -458,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 @@ -828,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; @@ -858,6 +899,48 @@ fi echo "__thread $tls_thread" ########################################## +# Whether or not __thread is supported for TLS +if test "$gfio" = "yes" ; then + cat > $TMPC << EOF +#include +#include +#include +int main(void) +{ + gdk_threads_enter(); + gdk_threads_leave(); + + printf("%d", GTK_CHECK_VERSION(2, 18, 0)); +} +EOF +GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0) +if test "$?" != "0" ; then + echo "configure: gtk and gthread not found" + exit 1 +fi +GTK_LIBS=$(pkg-config --libs gtk+-2.0 gthread-2.0) +if test "$?" != "0" ; then + echo "configure: gtk and gthread not found" + exit 1 +fi +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" +fi +fi + +echo "gfio $gfio" + # Check whether we have getrusage(RUSAGE_THREAD) rusage_thread="no" cat > $TMPC << EOF @@ -909,12 +992,24 @@ 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" @@ -1011,13 +1106,20 @@ fi if test "$rusage_thread" = "yes" ; then output_sym "CONFIG_RUSAGE_THREAD" fi +if test "$gfio" = "yes" ; then + echo "CONFIG_GFIO=y" >> $config_host_mak +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 "CFLAGS+=$CFLAGS" >> $config_host_mak echo "CC=$cc" >> $config_host_mak echo "EXTFLAGS=$EXTFLAGS $CFLAGS" >> $config_host_mak