d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-10 14:57:52 +00:00
Code Issues Projects Releases Wiki Activity

Autotools: Improve handling of C++ mode

Browse Source
This commit is contained in:
sledgehammer999 2018-11-24 00:12:38 +02:00
parent 5efdd211cc
commit 8f5bbe24ce
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
3 changed files with 124 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
configure vendored
View File

@ -5013,12 +5013,6 @@ CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
# add workaround for problematic boost version # add workaround for problematic boost version
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# taken from ax_boost_base.m4 # taken from ax_boost_base.m4
@ -5039,12 +5033,6 @@ else
QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES" QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@ -5495,25 +5483,17 @@ $as_echo "yes" >&6; }
LIBS="$zlib_LIBS $LIBS" LIBS="$zlib_LIBS $LIBS"
fi fi
# Check compiler C++11 support # Check if already in >= C++11 mode because of the flags returned by one of the above packages
ac_ext=cpp { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler is using C++11 or later mode" >&5
ac_cpp='$CXXCPP $CPPFLAGS' $as_echo_n "checking if compiler is using C++11 or later mode... " >&6; }
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
_tmp="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -std=c++11"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef __cplusplus #ifndef __cplusplus
#error "This is not a C++ compiler" #error "This is not a C++ compiler"
#elif __cplusplus < 201103L #elif __cplusplus < 201103L
#error "This is not a C++11 compiler" #error "This is not a C++11 compiler"
#endif #endif
int int
main () main ()
{ {
@ -5521,25 +5501,34 @@ main ()
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then : if ac_fn_cxx_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
QBT_CXX11_FOUND="yes"
else else
as_fn_error $? "A compiler supporting C++11 is required." "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
QBT_CXX11_FOUND="no"
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$_tmp"
_tmp="$CXXFLAGS" # In case of no, check if the compiler can support at least C++11
CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS" # and if yes, enable it leaving a warning to the user
cat confdefs.h - <<_ACEOF >conftest.$ac_ext if test "x$QBT_CXX11_FOUND" = "xno"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports C++11" >&5
$as_echo_n "checking if compiler supports C++11... " >&6; }
TMP_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -std=c++11"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef __cplusplus #ifndef __cplusplus
#error "This is not a C++ compiler" #error "This is not a C++ compiler"
#elif __cplusplus < 201103L #elif __cplusplus < 201103L
#error "This is not a C++11 compiler" #error "This is not a C++11 compiler"
#endif #endif
int int
main () main ()
{ {
@ -5547,22 +5536,58 @@ main ()
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then : if ac_fn_cxx_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++11 is disabled by the set compiler flags" >&5
$as_echo_n "checking if C++11 is disabled by the set compiler flags... " >&6; }
# prepend the flag so it won't override conflicting user defined flags
CPPFLAGS="-std=c++11 $TMP_CPPFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
#error "This is not a C++ compiler"
#elif __cplusplus < 201103L
#error "This is not a C++11 compiler"
#endif
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
CPPFLAGS="$TMP_CPPFLAGS -std=c++11"
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++11 mode is now force enabled.
Make sure you use the same C++ mode for qBittorrent and its dependencies.
To explicitly set qBittorrent to a later mode use CPPFLAGS.
Example: \`CPPFLAGS=\"\$CPPFLAGS -std=c++14\" ./configure\`" >&5
$as_echo "$as_me: WARNING: C++11 mode is now force enabled.
Make sure you use the same C++ mode for qBittorrent and its dependencies.
To explicitly set qBittorrent to a later mode use CPPFLAGS.
Example: \`CPPFLAGS=\"\$CPPFLAGS -std=c++14\" ./configure\`" >&2;}
else else
as_fn_error $? "Compiler is not working in C++11 or later mode. { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
Make sure you use the same C++ mode for qBittorrent and its dependencies. $as_echo "yes" >&6; }
Example: \`CXXFLAGS=\"\$CXXFLAGS -std=c++11\" ./configure\`" "$LINENO" 5 as_fn_error $? "The compiler supports C++11 but the user or a dependency has explicitly enabled a lower mode." "$LINENO" 5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "A compiler supporting C++11 is required." "$LINENO" 5
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$_tmp"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
fi
# These are required because autoconf doesn't expand these **particular** # These are required because autoconf doesn't expand these **particular**
# vars automatically. And qmake cannot autoexpand them. # vars automatically. And qmake cannot autoexpand them.
@ -5650,15 +5675,15 @@ extract() {
for i in $string; do for i in $string; do
case "$(echo "$i" | cut -c1)" in case "$(echo "$i" | cut -c1)" in
'') ;; '') ;;
D) QBT_CONF_DEFINES="$(echo $i | cut -c2-) $QBT_CONF_DEFINES";; D) QBT_CONF_DEFINES="$QBT_CONF_DEFINES $(echo $i | cut -c2-)";;
I) QBT_CONF_INCLUDES="$(echo $i | cut -c2-) $QBT_CONF_INCLUDES";; I) QBT_CONF_INCLUDES="$QBT_CONF_INCLUDES $(echo $i | cut -c2-)";;
*) QBT_CONF_EXTRA_CFLAGS="-$i $QBT_CONF_EXTRA_CFLAGS";; *) QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS -$i";;
esac esac
done done
IFS=$SAVEIFS IFS=$SAVEIFS
} }
extract "$CFLAGS $CPPFLAGS $CXXFLAGS" extract "$CFLAGS $CXXFLAGS $CPPFLAGS"
QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES" QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
# Substitute the values of these vars in conf.pri.in # Substitute the values of these vars in conf.pri.in

64
configure.ac
View File

@ -167,7 +167,6 @@ CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
# add workaround for problematic boost version # add workaround for problematic boost version
AC_LANG_PUSH(C++)
# taken from ax_boost_base.m4 # taken from ax_boost_base.m4
m4_define([DETECT_BOOST_VERSION_PROGRAM], m4_define([DETECT_BOOST_VERSION_PROGRAM],
[AC_LANG_PROGRAM([[#include <boost/version.hpp>]], [AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
@ -175,7 +174,6 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM],
AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [], AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
[QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"]) [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
AC_LANG_POP([C++])
AX_BOOST_SYSTEM() AX_BOOST_SYSTEM()
AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"]) AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
@ -202,31 +200,37 @@ PKG_CHECK_MODULES(zlib,
[CPPFLAGS="$zlib_CFLAGS $CPPFLAGS" [CPPFLAGS="$zlib_CFLAGS $CPPFLAGS"
LIBS="$zlib_LIBS $LIBS"]) LIBS="$zlib_LIBS $LIBS"])
# Check compiler C++11 support # Check if already in >= C++11 mode because of the flags returned by one of the above packages
AC_LANG_PUSH(C++) AC_MSG_CHECKING([if compiler is using C++11 or later mode])
m4_define([DETECT_CPP11_PROGRAM],
[AC_LANG_PROGRAM([[
#ifndef __cplusplus
#error "This is not a C++ compiler"
#elif __cplusplus < 201103L
#error "This is not a C++11 compiler"
#endif]],
[[]])])
_tmp="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -std=c++11"
AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()], AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
[], [AC_MSG_RESULT([yes])
[AC_MSG_ERROR([A compiler supporting C++11 is required.])]) QBT_CXX11_FOUND="yes"],
[AC_MSG_RESULT([no])
CXXFLAGS="$_tmp $libtorrent_CFLAGS" QBT_CXX11_FOUND="no"])
AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
[], # In case of no, check if the compiler can support at least C++11
[AC_MSG_ERROR([Compiler is not working in C++11 or later mode. # and if yes, enable it leaving a warning to the user
Make sure you use the same C++ mode for qBittorrent and its dependencies. AS_IF([test "x$QBT_CXX11_FOUND" = "xno"],
Example: `CXXFLAGS="\$CXXFLAGS -std=c++11" ./configure`])]) [AC_MSG_CHECKING([if compiler supports C++11])
CXXFLAGS="$_tmp" TMP_CPPFLAGS="$CPPFLAGS"
AC_LANG_POP([C++]) CPPFLAGS="$CPPFLAGS -std=c++11"
AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
[AC_MSG_RESULT([yes])
AC_MSG_CHECKING([if C++11 is disabled by the set compiler flags])
# prepend the flag so it won't override conflicting user defined flags
CPPFLAGS="-std=c++11 $TMP_CPPFLAGS"
AC_COMPILE_IFELSE([DETECT_CPP11_PROGRAM()],
[AC_MSG_RESULT([no])
CPPFLAGS="$TMP_CPPFLAGS -std=c++11"
AC_MSG_WARN([C++11 mode is now force enabled.
Make sure you use the same C++ mode for qBittorrent and its dependencies.
To explicitly set qBittorrent to a later mode use CPPFLAGS.
Example: `CPPFLAGS="\$CPPFLAGS -std=c++14" ./configure`])],
[AC_MSG_RESULT([yes])
AC_MSG_ERROR([The compiler supports C++11 but the user or a dependency has explicitly enabled a lower mode.])])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([A compiler supporting C++11 is required.])])
])
# These are required because autoconf doesn't expand these **particular** # These are required because autoconf doesn't expand these **particular**
# vars automatically. And qmake cannot autoexpand them. # vars automatically. And qmake cannot autoexpand them.
@ -254,15 +258,15 @@ extract() {
for i in $string; do for i in $string; do
case "$(echo "$i" | cut -c1)" in case "$(echo "$i" | cut -c1)" in
'') ;; '') ;;
D) QBT_CONF_DEFINES="$(echo $i | cut -c2-) $QBT_CONF_DEFINES";; D) QBT_CONF_DEFINES="$QBT_CONF_DEFINES $(echo $i | cut -c2-)";;
I) QBT_CONF_INCLUDES="$(echo $i | cut -c2-) $QBT_CONF_INCLUDES";; I) QBT_CONF_INCLUDES="$QBT_CONF_INCLUDES $(echo $i | cut -c2-)";;
*) QBT_CONF_EXTRA_CFLAGS="-$i $QBT_CONF_EXTRA_CFLAGS";; *) QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS -$i";;
esac esac
done done
IFS=$SAVEIFS IFS=$SAVEIFS
} }
extract "$CFLAGS $CPPFLAGS $CXXFLAGS" extract "$CFLAGS $CXXFLAGS $CPPFLAGS"
QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES" QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
# Substitute the values of these vars in conf.pri.in # Substitute the values of these vars in conf.pri.in

13
m4/qbittorrent.m4
View File

@ -36,3 +36,16 @@ AC_DEFUN([FIND_QTDBUS],
[AC_MSG_RESULT([not found]) [AC_MSG_RESULT([not found])
HAVE_QTDBUS=[false]]) HAVE_QTDBUS=[false]])
]) ])
# DETECT_CPP11_PROGRAM()
# Detects if at least C++11 mode is enabled.
# --------------------------------------
AC_DEFUN([DETECT_CPP11_PROGRAM],
[AC_LANG_PROGRAM([[
#ifndef __cplusplus
#error "This is not a C++ compiler"
#elif __cplusplus < 201103L
#error "This is not a C++11 compiler"
#endif]],
[[]])
])