Attachment #515302 for bug #644748

Lines 808-814 Link Here

(-)a/configure.json (-1 / +1 lines)
808	},	808	},
809	"largefile": {	809	"largefile": {
810	"label": "Large file support",	810	"label": "Large file support",
811	"condition": "!config.android && !config.integrity && !config.winrt",	811	"condition": "!config.android && !config.integrity && !config.winrt && !config.cygwin",
812	"output": [	812	"output": [
813	"privateConfig",	813	"privateConfig",
814	{ "type": "define", "name": "QT_LARGEFILE_SUPPORT", "value": 64 }	814	{ "type": "define", "name": "QT_LARGEFILE_SUPPORT", "value": 64 }

Lines 1-2 Link Here

(-)a/config.tests/iconv/iconv.pro (-1 / +1 lines)
1	SOURCES = iconv.cpp	1	SOURCES = iconv.cpp
2	mac\|mingw\|openbsd\|qnx\|haiku:LIBS += -liconv	2	mac\|mingw\|openbsd\|qnx\|haiku\|cygwin-*:LIBS += -liconv




#
MAKEFILE_GENERATOR      = UNIX
QMAKE_PLATFORM          = cygwin
CONFIG                 += incremental
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/unix.conf)
# override Cygwin library prefixes and extensions
QMAKE_PREFIX_SHLIB      = cyg
QMAKE_EXTENSION_SHLIB   = dll
QMAKE_CYGWIN_EXE        = 1
QMAKE_CYGWIN_SHLIB      = 1
QMAKE_CFLAGS           += -fno-keep-inline-dllexport -D_GNU_SOURCE
QMAKE_CFLAGS_PIC        =
QMAKE_LEXFLAGS          =
QMAKE_YACC              = bison -y
QMAKE_YACCFLAGS         = -d
QMAKE_CFLAGS            = -pipe
QMAKE_CFLAGS_DEPS       = -M
QMAKE_CFLAGS_WARN_ON    = -Wall -W
QMAKE_CFLAGS_WARN_OFF   = -w
QMAKE_CFLAGS_RELEASE    = -O2
QMAKE_CFLAGS_DEBUG      = -g
QMAKE_CFLAGS_SHLIB      =
QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
QMAKE_CFLAGS_THREAD     = -D_REENTRANT

QMAKE_CXX               = g++
QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
QMAKE_INCDIR            =
QMAKE_LIBDIR            =
QMAKE_INCDIR_X11        = /usr/X11R6/include
QMAKE_LIBDIR_X11        = /usr/X11R6/lib
QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib

QMAKE_LINK              = g++
QMAKE_LINK_SHLIB        = g++
QMAKE_LINK_C            = gcc
QMAKE_LINK_C_SHLIB      = gcc
QMAKE_LFLAGS            =
QMAKE_LFLAGS_RELEASE    =
QMAKE_LFLAGS_DEBUG      =
QMAKE_LFLAGS_SHLIB      = -shared
QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME     =
QMAKE_LFLAGS_RPATH      =
QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections

QMAKE_INCDIR            =
QMAKE_LIBDIR            =
QMAKE_INCDIR_X11        =
QMAKE_LIBDIR_X11        =
QMAKE_INCDIR_OPENGL     =
QMAKE_LIBDIR_OPENGL     =
QMAKE_LIBS              =
QMAKE_LIBS_DYNLOAD      = -ldl
QMAKE_LIBS_X11          = -lXext -lX11
QMAKE_LIBS_OPENGL       = -lGL
QMAKE_LIBS_THREAD       = -lpthread
QMAKE_PREFIX_SHLIB      = lib
QMAKE_EXTENSION_SHLIB   = dll
QMAKE_PREFIX_STATICLIB  = lib
QMAKE_EXTENSION_STATICLIB = a
QMAKE_AR                = ar cqs
QMAKE_OBJCOPY           = objcopy
QMAKE_NM                = nm -P
QMAKE_RANLIB            =
#QMAKE_STRIP             = strip
#QMAKE_STRIPFLAGS_LIB   += --strip-unneeded

include(../common/gcc-base.conf)
include(../common/g++-base.conf)
load(qt_config)




#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/ipc.h>
#include <sys/shm.h>
//      http://afni.nimh.nih.gov/afni/afniboard/messages/1725.html
#include <sys/time.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/wait.h>
//#include <windows.h>
#include <netinet/in.h>
#define QT_NO_USE_FSEEKO

#undef QT_OPEN_LARGEFILE
#define QT_OPEN_LARGEFILE 0
#if defined(_XOPEN_SOURCE) && ((_XOPEN_SOURCE - 0) >= 500)
#define QT_SNPRINTF             ::snprintf
#define QT_VSNPRINTF            ::vsnprintf
#endif

Lines 84-89 Link Here

(-)a/mkspecs/features/create_cmake.prf (+36 lines)
84	CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/	84	CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
85	CMAKE_DLL_DIR_IS_ABSOLUTE = True	85	CMAKE_DLL_DIR_IS_ABSOLUTE = True
86	}	86	}
		87	} else:cygwin* {
		88	CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX]/bin/, $$[QT_INSTALL_PREFIX])
		89	contains(CMAKE_DLL_DIR, "^\\.\\./.*") {
		90	CMAKE_DLL_DIR = $$[QT_INSTALL_PREFIX]/bin/
		91	CMAKE_DLL_DIR_IS_ABSOLUTE = True
		92	}
87	} else {	93	} else {
88	CMAKE_DLL_DIR = $$CMAKE_LIB_DIR	94	CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
89	CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE	95	CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
Lines 145-150 Link Here
145	CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib	151	CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
146	CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib	152	CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
147	}	153	}
		154	} else:cygwin-* {
		155	isEmpty(CMAKE_STATIC_TYPE) {
		156	CMAKE_PlUGIN_PFX = cyg
		157	CMAKE_PlUGIN_EXT = .dll
		158	} else {
		159	CMAKE_PlUGIN_PFX = lib
		160	CMAKE_PlUGIN_EXT = .a
		161	}
		162
		163	CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_PlUGIN_PFX}$${TARGET}$${CMAKE_PlUGIN_EXT}
		164	CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_PlUGIN_PFX}$${TARGET}$${CMAKE_PlUGIN_EXT}
148	} else {	165	} else {
149	mac {	166	mac {
150	isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib	167	isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
Lines 255-260 Link Here
255	CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib	272	CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
256	}	273	}
257	}	274	}
		275	} else:cygwin-* {
		276	CMAKE_WINDOWS_BUILD = "true"
		277	CMAKE_CYGWIN_BUILD = "true"
		278	!isEmpty(CMAKE_STATIC_TYPE) {
		279	CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
		280	CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
		281	CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.prl
		282	CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
		283	} else:unversioned_libname {
		284	CMAKE_LIB_SONAME = cyg$${CMAKE_QT_STEM}.dll
		285	CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_LIB_SONAME}
		286	CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_LIB_SONAME}
		287	} else {
		288	CMAKE_LIB_SONAME = cyg$${CMAKE_QT_STEM}-$$section(QT.$${MODULE}.VERSION, ., 0, 0).dll
		289	CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_LIB_SONAME}
		290	CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_LIB_SONAME}
		291	CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.dll.a
		292	CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.dll.a
		293	}
258	} else {	294	} else {
259	!isEmpty(CMAKE_STATIC_TYPE) {	295	!isEmpty(CMAKE_STATIC_TYPE) {
260	CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a	296	CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a

Lines 29-34 Link Here

(-)a/mkspecs/features/qt_app.prf (+1 lines)
29	contains(QT, core(-private)?\|xml) {	29	contains(QT, core(-private)?\|xml) {
30	QT -= core core-private xml	30	QT -= core core-private xml
31	QT += bootstrap-private	31	QT += bootstrap-private
		32	LIBS_PRIVATE += -lz
32	}	33	}
33	target.path = $$[QT_HOST_BINS]	34	target.path = $$[QT_HOST_BINS]
34	} else {	35	} else {

Lines 187-193 Link Here

(-)a/mkspecs/features/qt_functions.prf (-1 / +1 lines)
187	!isEmpty(deps) {	187	!isEmpty(deps) {
188	libs = libs	188	libs = libs
189	deppath.CONFIG = prepend	189	deppath.CONFIG = prepend
190	equals(QMAKE_HOST.os, Windows) {	190	contains(QMAKE_HOST.os, Windows\|CYGWIN.*) {
191	libs = bins	191	libs = bins
192	deppath.CONFIG = always_prepend	192	deppath.CONFIG = always_prepend
193	deppath.name = PATH	193	deppath.name = PATH

Return to bug 644748

Lines 730-736 Link Here

(-)a/configure (-2 / +2 lines)
730	echo "########################################################################" > "$mkfile"	730	echo "########################################################################" > "$mkfile"
731	echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"	731	echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
732	echo "########################################################################" >> "$mkfile"	732	echo "########################################################################" >> "$mkfile"
733	EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"	733	EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_GNUCXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
734	EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"	734	EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"
735		735
736	if [ "$PLATFORM" = "irix-cc" ] \|\| [ "$PLATFORM" = "irix-cc-64" ]; then	736	if [ "$PLATFORM" = "irix-cc" ] \|\| [ "$PLATFORM" = "irix-cc-64" ]; then
Lines 741-747 Link Here
741	setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"	741	setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
742	setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"	742	setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
743	setBootstrapVariable QMAKE_CXXFLAGS	743	setBootstrapVariable QMAKE_CXXFLAGS
744	setBootstrapVariable QMAKE_CXXFLAGS_CXX11	744	setBootstrapVariable QMAKE_CXXFLAGS_GNUCXX11
745	setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS	745	setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
746	setBootstrapVariable QMAKE_LFLAGS	746	setBootstrapVariable QMAKE_LFLAGS
747	setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS	747	setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS

Lines 5-75 Link Here

(-)a/mkspecs/cygwin-g++/qmake.conf (-47 / +25 lines)
5	#	5	#
6	MAKEFILE_GENERATOR = UNIX	6	MAKEFILE_GENERATOR = UNIX
7	QMAKE_PLATFORM = cygwin unix posix	7	QMAKE_PLATFORM = cygwin
8	CONFIG += incremental unversioned_libname	8	CONFIG += incremental
9	QMAKE_INCREMENTAL_STYLE = sublib	9	QMAKE_INCREMENTAL_STYLE = sublib
10	QMAKE_COMPILER = gcc	10	include(../common/unix.conf)
		11	# override Cygwin library prefixes and extensions
		12	QMAKE_PREFIX_SHLIB = cyg
		13	QMAKE_EXTENSION_SHLIB = dll
		14	QMAKE_CYGWIN_EXE = 1
		15	QMAKE_CYGWIN_SHLIB = 1
11	QMAKE_CC = gcc	16	QMAKE_CFLAGS += -fno-keep-inline-dllexport -D_GNU_SOURCE
12	QMAKE_LEX = flex	17	QMAKE_CFLAGS_PIC =
13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = bison -y
15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS = -pipe
17	QMAKE_CFLAGS_DEPS = -M
18	QMAKE_CFLAGS_WARN_ON = -Wall -W
19	QMAKE_CFLAGS_WARN_OFF = -w
20	QMAKE_CFLAGS_RELEASE = -O2
21	QMAKE_CFLAGS_DEBUG = -g
22	QMAKE_CFLAGS_SHLIB =
23	QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
24	QMAKE_CFLAGS_THREAD = -D_REENTRANT	18	QMAKE_CFLAGS_THREAD = -D_REENTRANT
25
26	QMAKE_CXX = g++
27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
28	QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
29	QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
30	QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
31	QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
32	QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
33	QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
34	QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
35	QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD	19	QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
36	QMAKE_INCDIR =
37	QMAKE_LIBDIR =
38	QMAKE_INCDIR_X11 = /usr/X11R6/include
39	QMAKE_LIBDIR_X11 = /usr/X11R6/lib
40	QMAKE_INCDIR_OPENGL = /usr/X11R6/include
41	QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
42
43	QMAKE_LINK = g++
44	QMAKE_LINK_SHLIB = g++
45	QMAKE_LINK_C = gcc
46	QMAKE_LINK_C_SHLIB = gcc
47	QMAKE_LFLAGS =
48	QMAKE_LFLAGS_RELEASE =
49	QMAKE_LFLAGS_DEBUG =
50	QMAKE_LFLAGS_SHLIB = -shared	20	QMAKE_LFLAGS_SHLIB = -shared
51	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB	21	QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
52	QMAKE_LFLAGS_SONAME = -Wl,-soname,	22	QMAKE_LFLAGS_SONAME =
53	QMAKE_LFLAGS_THREAD =	23	QMAKE_LFLAGS_RPATH =
54	QMAKE_LFLAGS_RPATH = -Wl,-rpath,	24	QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
		25
		26	QMAKE_INCDIR =
		27	QMAKE_LIBDIR =
		28	QMAKE_INCDIR_X11 =
		29	QMAKE_LIBDIR_X11 =
		30	QMAKE_INCDIR_OPENGL =
		31	QMAKE_LIBDIR_OPENGL =
55	QMAKE_LIBS =	32	QMAKE_LIBS =
56	QMAKE_LIBS_DYNLOAD = -ldl	33	QMAKE_LIBS_DYNLOAD = -ldl
57	QMAKE_LIBS_X11 = -lXext -lX11	34	QMAKE_LIBS_X11 = -lXext -lX11
58	QMAKE_LIBS_OPENGL = -lGL	35	QMAKE_LIBS_OPENGL = -lGL
59	QMAKE_LIBS_THREAD = -lpthread	36	QMAKE_LIBS_THREAD = -lpthread
60	QMAKE_PREFIX_SHLIB = lib
61	QMAKE_EXTENSION_SHLIB = dll
62	QMAKE_PREFIX_STATICLIB = lib
63	QMAKE_EXTENSION_STATICLIB = a
64	QMAKE_AR = ar cqs	37	QMAKE_AR = ar cqs
65	QMAKE_OBJCOPY = objcopy	38	QMAKE_OBJCOPY = objcopy
66	QMAKE_NM = nm -P	39	QMAKE_NM = nm -P
67	QMAKE_RANLIB =	40	QMAKE_RANLIB =
		41	#QMAKE_STRIP = strip
		42	#QMAKE_STRIPFLAGS_LIB += --strip-unneeded
		43
		44	include(../common/gcc-base.conf)
		45	include(../common/g++-base.conf)
68	load(qt_config)	46	load(qt_config)

Lines 69-82 Link Here

(-)a/mkspecs/cygwin-g++/qplatformdefs.h (-5 / +3 lines)
69	#include <sys/types.h>	69	#include <sys/types.h>
70	#include <sys/ioctl.h>	70	#include <sys/ioctl.h>
71	// Cygwin does not provide <sys/ipc.h> and <sys/shm.h> because it	71	#include <sys/ipc.h>
72	// doesn't support SysV IPC or shared memory. See for example:	72	#include <sys/shm.h>
73	// http://afni.nimh.nih.gov/afni/afniboard/messages/1725.html
74	#include <sys/time.h>	73	#include <sys/time.h>
75	#include <sys/socket.h>	74	#include <sys/socket.h>
76	#include <sys/stat.h>	75	#include <sys/stat.h>
77	#include <sys/wait.h>	76	#include <sys/wait.h>
78	//#include <windows.h>
79	#include <netinet/in.h>	77	#include <netinet/in.h>
80	#define QT_NO_USE_FSEEKO	78	#define QT_NO_USE_FSEEKO
Lines 85-91 Link Here
85	#undef QT_OPEN_LARGEFILE	83	#undef QT_OPEN_LARGEFILE
86	#define QT_OPEN_LARGEFILE 0	84	#define QT_OPEN_LARGEFILE 0
87	#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)	85	#if defined(_XOPEN_SOURCE) && ((_XOPEN_SOURCE - 0) >= 500)
88	#define QT_SNPRINTF ::snprintf	86	#define QT_SNPRINTF ::snprintf
89	#define QT_VSNPRINTF ::vsnprintf	87	#define QT_VSNPRINTF ::vsnprintf
90	#endif	88	#endif