X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=ddf03a6b8e1b12faddb1f4a9310d30d45214dac7;hp=31ba82299993f9e10523c326d9156bee03206349;hb=0ffccc21fcd67d1e1d2a360e90f3fe8efc0d6b52;hpb=ae0db592368ce686a3ec9e00c57b4a1a0da0b9ed diff --git a/configure b/configure index 31ba8229..ddf03a6b 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #!/bin/sh # # Fio configure script. Heavily influenced by the manual qemu configure -# script. Sad this this is easier than autoconf and enemies. +# script. Sad this is easier than autoconf and enemies. # # set temporary file name @@ -145,6 +145,8 @@ devdax="no" pmem="no" disable_lex="" disable_pmem="no" +disable_native="no" +march_set="no" prefix=/usr/local # parse options @@ -173,9 +175,9 @@ for opt do ;; --disable-rdma) disable_rdma="yes" ;; - --disable-rbd) disable_rbd="yes" + --disable-rados) disable_rados="yes" ;; - --disable-rbd-blkin) disable_rbd_blkin="yes" + --disable-rbd) disable_rbd="yes" ;; --disable-gfapi) disable_gfapi="yes" ;; @@ -193,6 +195,8 @@ for opt do ;; --enable-cuda) enable_cuda="yes" ;; + --disable-native) disable_native="yes" + ;; --help) show_help="yes" ;; @@ -222,6 +226,7 @@ if test "$show_help" = "yes" ; then echo "--disable-shm Disable SHM support" echo "--disable-optimizations Don't enable compiler optimizations" echo "--enable-cuda Enable GPUDirect RDMA support" + echo "--disable-native Don't build for native host" exit $exit_val fi @@ -247,6 +252,8 @@ elif check_define __linux__ ; then targetos="Linux" elif check_define __OpenBSD__ ; then targetos='OpenBSD' +elif check_define __NetBSD__ ; then + targetos='NetBSD' elif check_define __sun__ ; then targetos='SunOS' CFLAGS="$CFLAGS -D_REENTRANT" @@ -275,7 +282,7 @@ fi # cross-compiling to one of these OSes then you'll need to specify # the correct CPU with the --cpu option. case $targetos in -AIX|OpenBSD) +AIX|OpenBSD|NetBSD) # Unless explicitly enabled, turn off lex. # OpenBSD will hit syntax error when enabled. if test -z "$disable_lex" ; then @@ -318,18 +325,8 @@ CYGWIN*) if test -z "${CC}${cross_prefix}"; then if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then cc="i686-w64-mingw32-gcc" - if test -e "../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then - echo "Building with zlib support" - output_sym "CONFIG_ZLIB" - echo "LIBS=../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak - fi else cc="x86_64-w64-mingw32-gcc" - if test -e "../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then - echo "Building with zlib support" - output_sym "CONFIG_ZLIB" - echo "LIBS=../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak - fi fi fi if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then @@ -357,7 +354,7 @@ CYGWIN*) static_assert="yes" ipv6="yes" mkdir_two="no" - echo "BUILD_CFLAGS=$CFLAGS -I../zlib -include config-host.h -D_GNU_SOURCE" >> $config_host_mak + echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak ;; esac @@ -1526,6 +1523,35 @@ if compile_prog "" "" "ipv6"; then fi print_config "IPv6 helpers" "$ipv6" +########################################## +# check for rados +if test "$rados" != "yes" ; then + rados="no" +fi +cat > $TMPC << EOF +#include + +int main(int argc, char **argv) +{ + rados_t cluster; + rados_ioctx_t io_ctx; + const char cluster_name[] = "ceph"; + const char user_name[] = "client.admin"; + const char pool[] = "rados"; + + /* The rados_create2 signature required was only introduced in ceph 0.65 */ + rados_create2(&cluster, cluster_name, user_name, 0); + rados_ioctx_create(cluster, pool, &io_ctx); + + return 0; +} +EOF +if test "$disable_rados" != "yes" && compile_prog "" "-lrados" "rados"; then + LIBS="-lrados $LIBS" + rados="yes" +fi +print_config "Rados engine" "$rados" + ########################################## # check for rbd if test "$rbd" != "yes" ; then @@ -1586,7 +1612,7 @@ print_config "rbd_poll" "$rbd_poll" fi ########################################## -# check for rbd_invaidate_cache() +# check for rbd_invalidate_cache() if test "$rbd_inval" != "yes" ; then rbd_inval="no" fi @@ -1607,36 +1633,6 @@ fi print_config "rbd_invalidate_cache" "$rbd_inval" fi -########################################## -# check for blkin -if test "$rbd_blkin" != "yes" ; then - rbd_blkin="no" -fi -cat > $TMPC << EOF -#include -#include - -int main(int argc, char **argv) -{ - int r; - struct blkin_trace_info t_info; - blkin_init_trace_info(&t_info); - rbd_completion_t completion; - rbd_image_t image; - uint64_t off; - size_t len; - const char *buf; - r = rbd_aio_write_traced(image, off, len, buf, completion, &t_info); - return 0; -} -EOF -if test "$disable_rbd" != "yes" && test "$disable_rbd_blkin" != "yes" \ - && compile_prog "" "-lrbd -lrados -lblkin" "rbd_blkin"; then - LIBS="-lblkin $LIBS" - rbd_blkin="yes" -fi -print_config "rbd blkin tracing" "$rbd_blkin" - ########################################## # Check whether we have setvbuf if test "$setvbuf" != "yes" ; then @@ -2054,6 +2050,24 @@ fi print_config "strndup" "$strndup" ########################################## +# probe +# Note: presence of implies that is +# also available but not the other way around. +if test "$valgrind_dev" != "yes" ; then + valgrind_dev="no" +fi +cat > $TMPC << EOF +#include +int main(int argc, char **argv) +{ + return 0; +} +EOF +if compile_prog "" "" "valgrind_dev"; then + valgrind_dev="yes" +fi +print_config "Valgrind headers" "$valgrind_dev" + # check march=armv8-a+crc+crypto if test "$march_armv8_a_crc_crypto" != "yes" ; then march_armv8_a_crc_crypto="no" @@ -2072,6 +2086,7 @@ EOF if compile_prog "-march=armv8-a+crc+crypto" "" ""; then march_armv8_a_crc_crypto="yes" CFLAGS="$CFLAGS -march=armv8-a+crc+crypto -DARCH_HAVE_CRC_CRYPTO" + march_set="yes" fi fi print_config "march_armv8_a_crc_crypto" "$march_armv8_a_crc_crypto" @@ -2110,6 +2125,21 @@ if compile_prog "" "" "mkdir(a, b)"; then fi print_config "mkdir(a, b)" "$mkdir_two" +########################################## +# check for cc -march=native +build_native="no" +cat > $TMPC << EOF +int main(int argc, char **argv) +{ + return 0; +} +EOF +if test "$disable_native" = "no" && test "$disable_opt" != "yes" && \ + compile_prog "-march=native" "" "march=native"; then + build_native="yes" +fi +print_config "Build march=native" "$build_native" + ############################################################################# if test "$wordsize" = "64" ; then @@ -2262,6 +2292,9 @@ fi if test "$ipv6" = "yes" ; then output_sym "CONFIG_IPV6" fi +if test "$rados" = "yes" ; then + output_sym "CONFIG_RADOS" +fi if test "$rbd" = "yes" ; then output_sym "CONFIG_RBD" fi @@ -2271,15 +2304,13 @@ fi if test "$rbd_inval" = "yes" ; then output_sym "CONFIG_RBD_INVAL" fi -if test "$rbd_blkin" = "yes" ; then - output_sym "CONFIG_RBD_BLKIN" -fi if test "$setvbuf" = "yes" ; then output_sym "CONFIG_SETVBUF" fi if test "$s390_z196_facilities" = "yes" ; then output_sym "CONFIG_S390_Z196_FACILITIES" CFLAGS="$CFLAGS -march=z9-109" + march_set="yes" fi if test "$gfapi" = "yes" ; then output_sym "CONFIG_GFAPI" @@ -2341,8 +2372,14 @@ fi if test "$disable_opt" = "yes" ; then output_sym "CONFIG_DISABLE_OPTIMIZATIONS" fi +if test "$valgrind_dev" = "yes"; then + output_sym "CONFIG_VALGRIND_DEV" +fi if test "$zlib" = "no" ; then - echo "Consider installing zlib-dev (zlib-devel), some fio features depend on it." + echo "Consider installing zlib-dev (zlib-devel, some fio features depend on it." + if test "$build_static" = "yes"; then + echo "Note that some distros have separate packages for static libraries." + fi fi if test "$cuda" = "yes" ; then output_sym "CONFIG_CUDA" @@ -2350,6 +2387,9 @@ fi if test "$mkdir_two" = "yes" ; then output_sym "CONFIG_HAVE_MKDIR_TWO" fi +if test "$march_set" = "no" && test "$build_native" = "yes" ; then + output_sym "CONFIG_BUILD_NATIVE" +fi echo "LIBS+=$LIBS" >> $config_host_mak echo "GFIO_LIBS+=$GFIO_LIBS" >> $config_host_mak