Remove support for -no-largefile
It's 2016, and file sizes larger than 4G are common, so -no-largefile is something we really shouldn't support anymore. For now left the implementation as is, just removed the configurability from the command line. But this should really get replaced by decent configure checks that check for 64bit stat() vs stat64() vs 32bit stat(). Change-Id: I057515e3cc1f06a022d80f02e866944428026b1d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
parent
5f136bccd8
commit
84d3a21c9e
23
configure
vendored
23
configure
vendored
@ -699,7 +699,7 @@ CFG_ICONV=auto
|
|||||||
CFG_DBUS=auto
|
CFG_DBUS=auto
|
||||||
CFG_GLIB=auto
|
CFG_GLIB=auto
|
||||||
CFG_GTK=auto
|
CFG_GTK=auto
|
||||||
CFG_LARGEFILE=auto
|
CFG_LARGEFILE=yes
|
||||||
CFG_OPENSSL=auto
|
CFG_OPENSSL=auto
|
||||||
CFG_LIBPROXY=auto
|
CFG_LIBPROXY=auto
|
||||||
CFG_SECURETRANSPORT=auto
|
CFG_SECURETRANSPORT=auto
|
||||||
@ -1959,13 +1959,6 @@ while [ "$#" -gt 0 ]; do
|
|||||||
UNKNOWN_OPT=yes
|
UNKNOWN_OPT=yes
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
largefile)
|
|
||||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
|
||||||
CFG_LARGEFILE="$VAL"
|
|
||||||
else
|
|
||||||
UNKNOWN_OPT=yes
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
openssl)
|
openssl)
|
||||||
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
|
||||||
CFG_OPENSSL="$VAL"
|
CFG_OPENSSL="$VAL"
|
||||||
@ -2335,9 +2328,6 @@ Configure options:
|
|||||||
* -shared ............ Create and use shared Qt libraries.
|
* -shared ............ Create and use shared Qt libraries.
|
||||||
-static ............ Create and use static Qt libraries.
|
-static ............ Create and use static Qt libraries.
|
||||||
|
|
||||||
-no-largefile ...... Disables large file support.
|
|
||||||
+ -largefile ......... Enables Qt to access files larger than 4 GB.
|
|
||||||
|
|
||||||
-no-accessibility .. Do not compile Accessibility support.
|
-no-accessibility .. Do not compile Accessibility support.
|
||||||
Disabling accessibility is not recommended, as it will break QStyle
|
Disabling accessibility is not recommended, as it will break QStyle
|
||||||
and may break other internal parts of Qt.
|
and may break other internal parts of Qt.
|
||||||
@ -4619,11 +4609,6 @@ if [ "$CFG_SYSLOG" != "no" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$CFG_LARGEFILE" = "auto" ]; then
|
|
||||||
#Large files should be enabled for all Linux systems
|
|
||||||
CFG_LARGEFILE=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$CFG_GUI" = "no" ]; then
|
if [ "$CFG_GUI" = "no" ]; then
|
||||||
QPA_PLATFORM_GUARD=no
|
QPA_PLATFORM_GUARD=no
|
||||||
fi
|
fi
|
||||||
@ -6063,11 +6048,6 @@ elif [ "$CFG_GSTREAMER" = "1.0" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$CFG_LARGEFILE" != "yes" ] && [ "$XPLATFORM_MINGW" = "yes" ]; then
|
|
||||||
echo "Warning: largefile support cannot be disabled for win32."
|
|
||||||
CFG_LARGEFILE="yes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
# ask for all that hasn't been auto-detected or specified in the arguments
|
# ask for all that hasn't been auto-detected or specified in the arguments
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
@ -6998,7 +6978,6 @@ report_support " Qt D-Bus ..............." "$CFG_DBUS" runtime "loading dbus-1
|
|||||||
report_support " Qt Concurrent .........." "$CFG_CONCURRENT"
|
report_support " Qt Concurrent .........." "$CFG_CONCURRENT"
|
||||||
report_support " Qt GUI ................." "$CFG_GUI"
|
report_support " Qt GUI ................." "$CFG_GUI"
|
||||||
report_support " Qt Widgets ............." "$CFG_WIDGETS"
|
report_support " Qt Widgets ............." "$CFG_WIDGETS"
|
||||||
report_support " Large File ............." "$CFG_LARGEFILE"
|
|
||||||
report_support " QML debugging .........." "$CFG_QML_DEBUG"
|
report_support " QML debugging .........." "$CFG_QML_DEBUG"
|
||||||
report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES"
|
report_support " Use system proxies ....." "$CFG_SYSTEM_PROXIES"
|
||||||
|
|
||||||
|
@ -1225,10 +1225,6 @@ void Configure::parseCmdLine()
|
|||||||
dictionary["QT_INOTIFY"] = "no";
|
dictionary["QT_INOTIFY"] = "no";
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (configCmdLine.at(i) == "-largefile") {
|
|
||||||
dictionary["LARGE_FILE"] = "yes";
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (configCmdLine.at(i) == "-fontconfig") {
|
else if (configCmdLine.at(i) == "-fontconfig") {
|
||||||
dictionary["FONT_CONFIG"] = "yes";
|
dictionary["FONT_CONFIG"] = "yes";
|
||||||
} else if (configCmdLine.at(i) == "-no-fontconfig") {
|
} else if (configCmdLine.at(i) == "-no-fontconfig") {
|
||||||
@ -1776,8 +1772,6 @@ bool Configure::displayHelp()
|
|||||||
desc("QT_EVENTFD", "yes", "-eventfd", "Enable eventfd(7) support in the UNIX event loop.");
|
desc("QT_EVENTFD", "yes", "-eventfd", "Enable eventfd(7) support in the UNIX event loop.");
|
||||||
desc("QT_EVENTFD", "no", "-no-eventfd", "Disable eventfd(7) support in the UNIX event loop.\n");
|
desc("QT_EVENTFD", "no", "-no-eventfd", "Disable eventfd(7) support in the UNIX event loop.\n");
|
||||||
|
|
||||||
desc("LARGE_FILE", "yes", "-largefile", "Enables Qt to access files larger than 4 GB.\n");
|
|
||||||
|
|
||||||
desc("POSIX_IPC", "yes", "-posix-ipc", "Enable POSIX IPC.\n");
|
desc("POSIX_IPC", "yes", "-posix-ipc", "Enable POSIX IPC.\n");
|
||||||
|
|
||||||
desc("QT_GLIB", "yes", "-glib", "Compile Glib support.\n");
|
desc("QT_GLIB", "yes", "-glib", "Compile Glib support.\n");
|
||||||
@ -3630,7 +3624,6 @@ void Configure::displayConfig()
|
|||||||
<< (dictionary[ "AVX512" ].isEmpty() ? QString("<none>") : dictionary[ "AVX512" ].toUpper()) << endl;
|
<< (dictionary[ "AVX512" ].isEmpty() ? QString("<none>") : dictionary[ "AVX512" ].toUpper()) << endl;
|
||||||
sout << "NEON support................" << dictionary[ "NEON" ] << endl;
|
sout << "NEON support................" << dictionary[ "NEON" ] << endl;
|
||||||
sout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
|
sout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
|
||||||
sout << "Large File support.........." << dictionary[ "LARGE_FILE" ] << endl;
|
|
||||||
sout << "NIS support................." << dictionary[ "NIS" ] << endl;
|
sout << "NIS support................." << dictionary[ "NIS" ] << endl;
|
||||||
sout << "Iconv support..............." << dictionary[ "QT_ICONV" ] << endl;
|
sout << "Iconv support..............." << dictionary[ "QT_ICONV" ] << endl;
|
||||||
sout << "Evdev support..............." << dictionary[ "QT_EVDEV" ] << endl;
|
sout << "Evdev support..............." << dictionary[ "QT_EVDEV" ] << endl;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user