-rw-r--r-- | mkspecs/hpux-acc-64/qmake.conf | 23 | ||||
-rw-r--r-- | mkspecs/hpux-acc-64/qplatformdefs.h | 12 |
2 files changed, 23 insertions, 12 deletions
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 7ce4711..d43273e 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf | |||
@@ -4,118 +4,123 @@ | |||
4 | # qmake configuration for hpux-n64 | 4 | # qmake configuration for hpux-n64 |
5 | # | 5 | # |
6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore | 6 | # We define _POSIX_C_SOURCE to 199506L when using threads, therefore |
7 | # we also need to redefine _HPUX_SOURCE. | 7 | # we also need to redefine _HPUX_SOURCE. |
8 | # From pthread(3t): | 8 | # From pthread(3t): |
9 | # Some documentation will recommend the use of -D_REENTRANT for | 9 | # Some documentation will recommend the use of -D_REENTRANT for |
10 | # compilation. While this also functions properly, it is considered | 10 | # compilation. While this also functions properly, it is considered |
11 | # an obsolescent form. | 11 | # an obsolescent form. |
12 | # See pthread(3t) for more details. | 12 | # See pthread(3t) for more details. |
13 | # | 13 | # |
14 | # From the "HP aC++ Online Programmer's Guide": | 14 | # From the "HP aC++ Online Programmer's Guide": |
15 | # When +DA2.0W is specified: | 15 | # When +DA2.0W is specified: |
16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files | 16 | # * 64-bit SVR4 Executable and Linking Format (ELF) object files |
17 | # are generated for PA-RISC 2.0. | 17 | # are generated for PA-RISC 2.0. |
18 | # * The preprocessor predefined macro, __LP64__ is defined. | 18 | # * The preprocessor predefined macro, __LP64__ is defined. |
19 | # * The correct path for 64-bit system and language libraries is | 19 | # * The correct path for 64-bit system and language libraries is |
20 | # selected. | 20 | # selected. |
21 | # When +DD32 is specified: | 21 | # When +DD32 is specified: |
22 | # * The size of an int, long, or pointer data type is 32-bits. | 22 | # * The size of an int, long, or pointer data type is 32-bits. |
23 | # The size of an int data type is 32-bits. The size of a long or | 23 | # The size of an int data type is 32-bits. The size of a long or |
24 | # pointer data type is 64-bits. | 24 | # pointer data type is 64-bits. |
25 | # * This is the default, currently equivalent to +DA1.1 architecture. | 25 | # * This is the default, currently equivalent to +DA1.1 architecture. |
26 | # When +DD64 is specified: | 26 | # When +DD64 is specified: |
27 | # * The size of an int data type is 32-bits. The size of a long or | 27 | # * The size of an int data type is 32-bits. The size of a long or |
28 | # pointer data type is 64-bits. | 28 | # pointer data type is 64-bits. |
29 | # * This is currently equivalent to +DA2.OW architecture. | 29 | # * This is currently equivalent to +DA2.OW architecture. |
30 | # * The preprocessor predefined macro, __LP64__ is defined. | 30 | # * The preprocessor predefined macro, __LP64__ is defined. |
31 | # Using +DS to Specify Instruction Scheduling: | 31 | # Using +DS to Specify Instruction Scheduling: |
32 | # * By default, the compiler performs scheduling tuned for the system | 32 | # * By default, the compiler performs scheduling tuned for the system |
33 | # on which you are compiling, or, if specified, tuned for the setting | 33 | # on which you are compiling, or, if specified, tuned for the setting |
34 | # of the +DA option. | 34 | # of the +DA option. |
35 | # | 35 | # |
36 | # From the online "C/HP-UX Reference Manual": | 36 | # From the online "C/HP-UX Reference Manual": |
37 | #-Aa | 37 | #-Aa |
38 | # Enables strict ANSI C compliance. | 38 | # Enables strict ANSI C compliance. |
39 | # -Ae | 39 | # -Ae |
40 | # Enables ANSI C compliance, HP value-added features (as described | 40 | # Enables ANSI C compliance, HP value-added features (as described |
41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent | 41 | # for +e option), and _HPUX_SOURCE name space macro. It is equivalent |
42 | # to -Aa +e -D_HPUX_SOURCE. | 42 | # to -Aa +e -D_HPUX_SOURCE. |
43 | # +e | 43 | # +e |
44 | # Enables the following HP value added features while compiling in | 44 | # Enables the following HP value added features while compiling in |
45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied | 45 | # ANSI C mode: sized enum, long long, long pointers, compiler supplied |
46 | # defaults for missing arguments to intrinsic calls, and $ in identifier | 46 | # defaults for missing arguments to intrinsic calls, and $ in identifier |
47 | # HP C extensions. | 47 | # HP C extensions. |
48 | # | 48 | # |
49 | 49 | ||
50 | MAKEFILE_GENERATOR= UNIX | 50 | MAKEFILE_GENERATOR= UNIX |
51 | TEMPLATE = app | 51 | TEMPLATE = app |
52 | CONFIG += qt warn_on release | 52 | CONFIG += qt warn_on release link_prl |
53 | 53 | ||
54 | QMAKE_CC = cc | 54 | QMAKE_CC = cc |
55 | QMAKE_LEX = flex | 55 | QMAKE_LEX = flex |
56 | QMAKE_LEXFLAGS = | 56 | QMAKE_LEXFLAGS = |
57 | QMAKE_YACC = yacc | 57 | QMAKE_YACC = yacc |
58 | QMAKE_YACCFLAGS = -d | 58 | QMAKE_YACCFLAGS = -d |
59 | QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) | 59 | QMAKE_CFLAGS = -Ae +DA2.0W -w $(CFLAGS_EXTRA) |
60 | QMAKE_CFLAGS_WARN_ON= | 60 | QMAKE_CFLAGS_WARN_ON= |
61 | QMAKE_CFLAGS_WARN_OFF= | 61 | QMAKE_CFLAGS_WARN_OFF= -w |
62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize) | 62 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Osize) |
63 | QMAKE_CFLAGS_DEBUG= -g | 63 | QMAKE_CFLAGS_DEBUG= -g |
64 | QMAKE_CFLAGS_SHLIB= +Z | 64 | QMAKE_CFLAGS_SHLIB= +Z |
65 | QMAKE_CFLAGS_YACC= | 65 | QMAKE_CFLAGS_YACC= |
66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE | 66 | QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE |
67 | 67 | ||
68 | QMAKE_CXX = aCC | 68 | QMAKE_CXX = aCC |
69 | QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA) | 69 | QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE $(CXXFLAGS_EXTRA) |
70 | QMAKE_CXXFLAGS_DEPS= +M | ||
70 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 71 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
71 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 72 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
72 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 73 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
73 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 74 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
74 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 75 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
75 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 76 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
76 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 77 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
77 | 78 | ||
78 | QMAKE_INCDIR = | 79 | QMAKE_INCDIR = |
79 | QMAKE_LIBDIR = | 80 | QMAKE_LIBDIR = |
80 | QMAKE_INCDIR_X11= /usr/include/X11R6 | 81 | QMAKE_INCDIR_X11= /usr/include/X11R6 |
81 | QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64 | 82 | QMAKE_LIBDIR_X11= /usr/lib/X11R6/pa20_64 |
82 | QMAKE_INCDIR_QT = $(QTDIR)/include | 83 | QMAKE_INCDIR_QT = $(QTDIR)/include |
83 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 84 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
84 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include | 85 | QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include |
85 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 | 86 | QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 |
86 | 87 | ||
87 | QMAKE_LINK = aCC | 88 | QMAKE_LINK = aCC |
88 | QMAKE_LINK_SHLIB= aCC | 89 | QMAKE_LINK_SHLIB= aCC |
89 | QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) | 90 | QMAKE_LFLAGS = +DA2.0W -Wl,+s $(LFLAGS_EXTRA) |
90 | QMAKE_LFLAGS_RELEASE= -O | 91 | QMAKE_LFLAGS_RELEASE= -O |
91 | QMAKE_LFLAGS_DEBUG= -Wl,+tools -g | 92 | QMAKE_LFLAGS_DEBUG= -g |
92 | QMAKE_LFLAGS_SHLIB= -b | 93 | QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared |
93 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB | 94 | QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB |
94 | QMAKE_LFLAGS_SONAME= -Wl,+h, | 95 | QMAKE_LFLAGS_SONAME= -Wl,+h, |
95 | QMAKE_LFLAGS_THREAD= | 96 | QMAKE_LFLAGS_THREAD= |
96 | QMAKE_RPATH = -Wl,+b, | 97 | QMAKE_RPATH = -Wl,+b, |
98 | QMAKE_HPUX_SHLIB= 3 | ||
99 | QMAKE_EXTENSION_SHLIB= sl | ||
97 | 100 | ||
98 | QMAKE_LIBS = $(LIBS_EXTRA) | 101 | QMAKE_LIBS = -lm $(LIBS_EXTRA) |
99 | QMAKE_LIBS_DYNLOAD= -ldld | 102 | QMAKE_LIBS_DYNLOAD= -ldl |
100 | QMAKE_LIBS_X11 = -lXext -lX11 | 103 | QMAKE_LIBS_X11 = -lXext -lX11 |
101 | QMAKE_LIBS_X11SM= -lSM -lICE | 104 | QMAKE_LIBS_X11SM= -lSM -lICE |
102 | QMAKE_LIBS_QT = -lqt | 105 | QMAKE_LIBS_QT = -lqt |
103 | QMAKE_LIBS_QT_THREAD= -lqt-mt | 106 | QMAKE_LIBS_QT_THREAD= -lqt-mt |
104 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu | 107 | QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu -lXt |
105 | QMAKE_LIBS_OPENGL_QT= -lGL -lXm | 108 | QMAKE_LIBS_OPENGL_QT= -lGL -lXmu -lXt |
106 | QMAKE_LIBS_THREAD= -lpthread | 109 | QMAKE_LIBS_THREAD= -lpthread |
107 | QMAKE_LIBS_YACC = -ly | 110 | QMAKE_LIBS_YACC = -ly |
108 | 111 | ||
109 | QMAKE_MOC = $(QTDIR)/bin/moc | 112 | QMAKE_MOC = $(QTDIR)/bin/moc |
110 | QMAKE_UIC = $(QTDIR)/bin/uic | 113 | QMAKE_UIC = $(QTDIR)/bin/uic |
111 | 114 | ||
112 | QMAKE_AR = ar cqs | 115 | QMAKE_AR = ar cqs |
113 | QMAKE_RANLIB = | 116 | QMAKE_RANLIB = |
114 | 117 | ||
115 | QMAKE_TAR = tar -cf | 118 | QMAKE_TAR = tar -cf |
116 | QMAKE_GZIP = gzip -9f | 119 | QMAKE_GZIP = gzip -9f |
117 | 120 | ||
118 | QMAKE_COPY = cp -f | 121 | QMAKE_COPY = cp -f |
119 | QMAKE_MOVE = mv -f | 122 | QMAKE_MOVE = mv -f |
120 | QMAKE_DEL_FILE = rm -f | 123 | QMAKE_DEL_FILE = rm -f |
121 | QMAKE_DEL_DIR = rmdir | 124 | QMAKE_DEL_DIR = rmdir |
125 | QMAKE_CHK_DIR_EXISTS= test -d | ||
126 | QMAKE_MKDIR = mkdir -p | ||
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h index 8a1410c..1779974 100644 --- a/mkspecs/hpux-acc-64/qplatformdefs.h +++ b/mkspecs/hpux-acc-64/qplatformdefs.h | |||
@@ -1,80 +1,86 @@ | |||
1 | #ifndef QPLATFORMDEFS_H | 1 | #ifndef QPLATFORMDEFS_H |
2 | #define QPLATFORMDEFS_H | 2 | #define QPLATFORMDEFS_H |
3 | 3 | ||
4 | // Get Qt defines/settings | 4 | // Get Qt defines/settings |
5 | 5 | ||
6 | #include "qglobal.h" | 6 | #include "qglobal.h" |
7 | 7 | ||
8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs | 8 | // Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs |
9 | 9 | ||
10 | #include <unistd.h> | 10 | #include <unistd.h> |
11 | 11 | ||
12 | 12 | ||
13 | // We are hot - unistd.h should have turned on the specific APIs we requested | 13 | // We are hot - unistd.h should have turned on the specific APIs we requested |
14 | 14 | ||
15 | 15 | ||
16 | #ifdef QT_THREAD_SUPPORT | 16 | #ifdef QT_THREAD_SUPPORT |
17 | #include <pthread.h> | 17 | #include <pthread.h> |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #include <dirent.h> | 20 | #include <dirent.h> |
21 | #include <fcntl.h> | 21 | #include <fcntl.h> |
22 | #include <grp.h> | 22 | #include <grp.h> |
23 | #include <pwd.h> | 23 | #include <pwd.h> |
24 | #include <signal.h> | 24 | #include <signal.h> |
25 | #include <dl.h> | 25 | #include <dlfcn.h> |
26 | #define QT_HPUX_LD | ||
27 | #define QT_NO_LIBRARY_UNLOAD | ||
28 | 26 | ||
29 | #include <sys/types.h> | 27 | #include <sys/types.h> |
30 | #include <sys/ioctl.h> | 28 | #include <sys/ioctl.h> |
31 | #include <sys/ipc.h> | 29 | #include <sys/ipc.h> |
32 | #include <sys/time.h> | 30 | #include <sys/time.h> |
33 | #include <sys/shm.h> | 31 | #include <sys/shm.h> |
34 | #include <sys/socket.h> | 32 | #include <sys/socket.h> |
35 | #include <sys/stat.h> | 33 | #include <sys/stat.h> |
36 | #include <sys/wait.h> | 34 | #include <sys/wait.h> |
37 | 35 | ||
38 | // DNS header files are not fully covered by X/Open specifications. | 36 | // DNS header files are not fully covered by X/Open specifications. |
39 | // In particular nothing is said about res_* :/ | 37 | // In particular nothing is said about res_* :/ |
38 | // #ifdef __cplusplus | ||
39 | // extern "C" { | ||
40 | // #endif | ||
41 | // getres() is mangled because of missing extern "C" on | ||
42 | // HP-UX 11.x systems missing PHCO_23963 | ||
40 | #include <resolv.h> | 43 | #include <resolv.h> |
44 | // #ifdef __cplusplus | ||
45 | // } | ||
46 | // #endif | ||
41 | // Undeclared - at least on HP-UX 10.20. | 47 | // Undeclared - at least on HP-UX 10.20. |
42 | extern "C" int res_init(); | 48 | extern "C" int res_init(); |
43 | 49 | ||
44 | 50 | ||
45 | #if !defined(QT_NO_COMPAT) | 51 | #if !defined(QT_NO_COMPAT) |
46 | #define QT_STATBUF struct stat | 52 | #define QT_STATBUF struct stat |
47 | #define QT_STATBUF4TSTATstruct stat | 53 | #define QT_STATBUF4TSTATstruct stat |
48 | #define QT_STAT ::stat | 54 | #define QT_STAT ::stat |
49 | #define QT_FSTAT ::fstat | 55 | #define QT_FSTAT ::fstat |
50 | #define QT_STAT_REG S_IFREG | 56 | #define QT_STAT_REG S_IFREG |
51 | #define QT_STAT_DIR S_IFDIR | 57 | #define QT_STAT_DIR S_IFDIR |
52 | #define QT_STAT_MASK S_IFMT | 58 | #define QT_STAT_MASK S_IFMT |
53 | #define QT_STAT_LNK S_IFLNK | 59 | #define QT_STAT_LNK S_IFLNK |
54 | #define QT_FILENO fileno | 60 | #define QT_FILENO fileno |
55 | #define QT_OPEN ::open | 61 | #define QT_OPEN ::open |
56 | #define QT_CLOSE ::close | 62 | #define QT_CLOSE ::close |
57 | #define QT_LSEEK ::lseek | 63 | #define QT_LSEEK ::lseek |
58 | #define QT_READ ::read | 64 | #define QT_READ ::read |
59 | #define QT_WRITE ::write | 65 | #define QT_WRITE ::write |
60 | #define QT_ACCESS ::access | 66 | #define QT_ACCESS ::access |
61 | #define QT_GETCWD ::getcwd | 67 | #define QT_GETCWD ::getcwd |
62 | #define QT_CHDIR ::chdir | 68 | #define QT_CHDIR ::chdir |
63 | #define QT_MKDIR ::mkdir | 69 | #define QT_MKDIR ::mkdir |
64 | #define QT_RMDIR ::rmdir | 70 | #define QT_RMDIR ::rmdir |
65 | #define QT_OPEN_RDONLY O_RDONLY | 71 | #define QT_OPEN_RDONLY O_RDONLY |
66 | #define QT_OPEN_WRONLY O_WRONLY | 72 | #define QT_OPEN_WRONLY O_WRONLY |
67 | #define QT_OPEN_RDWR O_RDWR | 73 | #define QT_OPEN_RDWR O_RDWR |
68 | #define QT_OPEN_CREAT O_CREAT | 74 | #define QT_OPEN_CREAT O_CREAT |
69 | #define QT_OPEN_TRUNC O_TRUNC | 75 | #define QT_OPEN_TRUNC O_TRUNC |
70 | #define QT_OPEN_APPEND O_APPEND | 76 | #define QT_OPEN_APPEND O_APPEND |
71 | #endif | 77 | #endif |
72 | 78 | ||
73 | #define QT_SIGNAL_RETTYPEvoid | 79 | #define QT_SIGNAL_RETTYPEvoid |
74 | #define QT_SIGNAL_ARGS int | 80 | #define QT_SIGNAL_ARGS int |
75 | #define QT_SIGNAL_IGNORESIG_IGN | 81 | #define QT_SIGNAL_IGNORESIG_IGN |
76 | 82 | ||
77 | #define QT_SOCKLEN_T int | 83 | #define QT_SOCKLEN_T int |
78 | 84 | ||
79 | 85 | ||
80 | #endif // QPLATFORMDEFS_H | 86 | #endif // QPLATFORMDEFS_H |