| -rw-r--r-- | mkspecs/aix-xlc/qmake.conf | 11 | ||||
| -rw-r--r-- | mkspecs/aix-xlc/qplatformdefs.h | 2 |
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 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = xlc QMAKE_CC_THREAD = xlc_r @@ -21,7 +21,7 @@ QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3) QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -qthreaded -D_THREAD_SAFE +QMAKE_CFLAGS_THREAD = -qthreaded QMAKE_CXX = xlC QMAKE_CXX_THREAD = xlC_r @@ -49,8 +49,8 @@ QMAKE_LINK_SHLIB = ld QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ -o $(TARGETD) \ $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ - ar q lib$(QMAKE_TARGET).a $(TARGETD); \ - ranlib lib$(QMAKE_TARGET).a; \ + $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ + $(RANLIB) lib$(QMAKE_TARGET).a; \ mv lib$(QMAKE_TARGET).a $(DESTDIR) QMAKE_LFLAGS = $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = @@ -59,6 +59,7 @@ QMAKE_LFLAGS_SHLIB = QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = QMAKE_LFLAGS_THREAD = -L/usr/lib/threads +QMAKE_AIX_SHLIB = 1 QMAKE_LIBS = $(LIBS_EXTRA) QMAKE_LIBS_DYNLOAD = -ldl @@ -83,3 +84,5 @@ QMAKE_COPY = cp -f QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir +QMAKE_CHK_DIR_EXISTS = test -d +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 @@ #define QT_SOCKOPTLEN_T int #endif -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 500) // AIX 4.3 and better only #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf |