summaryrefslogtreecommitdiff
path: root/mkspecs/aix-xlc
Unidiff
Diffstat (limited to 'mkspecs/aix-xlc') (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/aix-xlc/qmake.conf11
-rw-r--r--mkspecs/aix-xlc/qplatformdefs.h2
2 files changed, 8 insertions, 5 deletions
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 76ead61..3ce593c 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -6,7 +6,7 @@
6 6
7 MAKEFILE_GENERATOR= UNIX 7 MAKEFILE_GENERATOR= UNIX
8 TEMPLATE = app 8 TEMPLATE = app
9 CONFIG += qt warn_on release 9 CONFIG += qt warn_on release link_prl
10 10
11 QMAKE_CC = xlc 11 QMAKE_CC = xlc
12 QMAKE_CC_THREAD = xlc_r 12 QMAKE_CC_THREAD = xlc_r
@@ -21,7 +21,7 @@ QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
21 QMAKE_CFLAGS_DEBUG= -g 21 QMAKE_CFLAGS_DEBUG= -g
22 QMAKE_CFLAGS_SHLIB= 22 QMAKE_CFLAGS_SHLIB=
23 QMAKE_CFLAGS_YACC= 23 QMAKE_CFLAGS_YACC=
24 QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE 24 QMAKE_CFLAGS_THREAD= -qthreaded
25 25
26 QMAKE_CXX = xlC 26 QMAKE_CXX = xlC
27 QMAKE_CXX_THREAD= xlC_r 27 QMAKE_CXX_THREAD= xlC_r
@@ -49,8 +49,8 @@ QMAKE_LINK_SHLIB = ld
49 QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \ 49 QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \
50 -o $(TARGETD) \ 50 -o $(TARGETD) \
51 $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ 51 $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
52 ar q lib$(QMAKE_TARGET).a $(TARGETD); \ 52 $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \
53 ranlib lib$(QMAKE_TARGET).a; \ 53 $(RANLIB) lib$(QMAKE_TARGET).a; \
54 mv lib$(QMAKE_TARGET).a $(DESTDIR) 54 mv lib$(QMAKE_TARGET).a $(DESTDIR)
55 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 55 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
56 QMAKE_LFLAGS_RELEASE= 56 QMAKE_LFLAGS_RELEASE=
@@ -59,6 +59,7 @@ QMAKE_LFLAGS_SHLIB =
59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB 59 QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
60 QMAKE_LFLAGS_SONAME= 60 QMAKE_LFLAGS_SONAME=
61 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads 61 QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
62 QMAKE_AIX_SHLIB = 1
62 63
63 QMAKE_LIBS = $(LIBS_EXTRA) 64 QMAKE_LIBS = $(LIBS_EXTRA)
64 QMAKE_LIBS_DYNLOAD= -ldl 65 QMAKE_LIBS_DYNLOAD= -ldl
@@ -83,3 +84,5 @@ QMAKE_COPY = cp -f
83 QMAKE_MOVE = mv -f 84 QMAKE_MOVE = mv -f
84 QMAKE_DEL_FILE = rm -f 85 QMAKE_DEL_FILE = rm -f
85 QMAKE_DEL_DIR = rmdir 86 QMAKE_DEL_DIR = rmdir
87 QMAKE_CHK_DIR_EXISTS= test -d
88 QMAKE_MKDIR = mkdir -p
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h
index 7685a7b..79afa5d 100644
--- a/mkspecs/aix-xlc/qplatformdefs.h
+++ b/mkspecs/aix-xlc/qplatformdefs.h
@@ -95,7 +95,7 @@
95 #define QT_SOCKOPTLEN_T int 95 #define QT_SOCKOPTLEN_T int
96#endif 96#endif
97 97
98#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) 98#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500)
99// AIX 4.3 and better only 99// AIX 4.3 and better only
100 #define QT_SNPRINTF ::snprintf 100 #define QT_SNPRINTF ::snprintf
101 #define QT_VSNPRINTF ::vsnprintf 101 #define QT_VSNPRINTF ::vsnprintf