From cbfc8b442e6765bf23de1ead6699bd7cf5b8cd57 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Tue, 9 Mar 2010 12:28:17 +0100 Subject: Remove largefile config test Somewhere in 2005 the code was changed to no longer run the exe but just to compile it which means that as soon as the simple exe compiled large file support was set to true. Removing the complexity and just setting the default to true in the configure script sounds like the honest thing to do :) --- config.tests/unix/largefile/largefile.pro | 3 -- config.tests/unix/largefile/largefiletest.cpp | 73 --------------------------- configure | 19 +------ 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 config.tests/unix/largefile/largefile.pro delete mode 100644 config.tests/unix/largefile/largefiletest.cpp diff --git a/config.tests/unix/largefile/largefile.pro b/config.tests/unix/largefile/largefile.pro deleted file mode 100644 index d7affc6..0000000 --- a/config.tests/unix/largefile/largefile.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES=largefiletest.cpp -CONFIG-=qt dylib -mac:CONFIG -= app_bundle diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp deleted file mode 100644 index bf25de9..0000000 --- a/config.tests/unix/largefile/largefiletest.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Sample program for configure to test Large File support on target -platforms. -*/ - -#define _LARGEFILE_SOURCE -#define _LARGE_FILES -#define _FILE_OFFSET_BITS 64 -#include -#include -#include -#include -#include - -int main( int, char **argv ) -{ -// check that off_t can hold 2^63 - 1 and perform basic operations... -#define OFF_T_64 (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - if (OFF_T_64 % 2147483647 != 1) - return 1; - - // stat breaks on SCO OpenServer - struct stat buf; - stat( argv[0], &buf ); - if (!S_ISREG(buf.st_mode)) - return 2; - - FILE *file = fopen( argv[0], "r" ); - off_t offset = ftello( file ); - fseek( file, offset, SEEK_CUR ); - fclose( file ); - return 0; -} diff --git a/configure b/configure index b6ba1e8..94ea874 100755 --- a/configure +++ b/configure @@ -725,7 +725,7 @@ CFG_DBUS=auto CFG_GLIB=auto CFG_GSTREAMER=auto CFG_QGTKSTYLE=auto -CFG_LARGEFILE=auto +CFG_LARGEFILE=yes CFG_OPENSSL=auto CFG_PTMALLOC=no CFG_STL=auto @@ -5888,23 +5888,6 @@ if [ "$CFG_GETIFADDRS" != "no" ]; then fi fi -# find if the platform supports X/Open Large File compilation environment -if [ "$CFG_LARGEFILE" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_LARGEFILE=yes - else - if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - echo "X/Open Large File support cannot be enabled due to functionality tests!" - echo " Turn on verbose messaging (-v) to $0 to see the final report." - echo " If you believe this message is in error you may use the continue" - echo " switch (-continue) to $0 to continue." - exit 101 - else - CFG_LARGEFILE=no - fi - fi -fi - # detect OpenSSL if [ "$CFG_OPENSSL" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then -- cgit v0.12