diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch')
| -rw-r--r-- | meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch | 152 |
1 files changed, 0 insertions, 152 deletions
diff --git a/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch b/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch deleted file mode 100644 index e36c554f46..0000000000 --- a/meta-oe/recipes-qt/qt4/qmake2/0001-fix-mkspecs.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 04f1a1d766de39797362cd748299bd29251f6cfc Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Sun, 19 Jun 2011 19:50:05 +0200 -Subject: [PATCH] fix mkspecs for OE usage - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - mkspecs/common/g++.conf | 32 +++++++++++++++++++------------- - mkspecs/common/linux.conf | 33 +++++++++++++++++++-------------- - 2 files changed, 38 insertions(+), 27 deletions(-) - -diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf -index 0d511fc..80f925c 100644 ---- a/mkspecs/common/g++.conf -+++ b/mkspecs/common/g++.conf -@@ -2,13 +2,13 @@ - # qmake configuration for common gcc - # - --QMAKE_CC = gcc --QMAKE_CFLAGS += -pipe -+QMAKE_CC = $(OE_QMAKE_CC) -+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 --QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g -+QMAKE_CFLAGS_RELEASE += - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -17,8 +17,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden - QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} - QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} - --QMAKE_CXX = g++ --QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -+QMAKE_CXX = $(OE_QMAKE_CXX) -+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) - QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON - QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -@@ -32,12 +32,12 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden - QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - --QMAKE_LINK = g++ --QMAKE_LINK_SHLIB = g++ --QMAKE_LINK_C = gcc --QMAKE_LINK_C_SHLIB = gcc --QMAKE_LFLAGS += --QMAKE_LFLAGS_RELEASE += -Wl,-O1 -+QMAKE_LINK = $(OE_QMAKE_LINK) -+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LINK_C = $(OE_QMAKE_LINK) -+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) -+QMAKE_LFLAGS_RELEASE += - QMAKE_LFLAGS_DEBUG += - QMAKE_LFLAGS_APP += - QMAKE_LFLAGS_SHLIB += -shared -@@ -45,10 +45,16 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME += -Wl,-soname, - QMAKE_LFLAGS_THREAD += - QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, - - QMAKE_PCH_OUTPUT_EXT = .gch - - # -Bsymbolic-functions (ld) support - QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions - QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, -+ -+# some linking helper... -+CONFIG += rpath_libdirs -+ -+# for the SDK -+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) -diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf -index 4fbe2dc..a541355 100644 ---- a/mkspecs/common/linux.conf -+++ b/mkspecs/common/linux.conf -@@ -7,25 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD - - QMAKE_INCDIR = - QMAKE_LIBDIR = --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib --QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] --QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = -+QMAKE_LIBDIR_X11 = -+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -+QMAKE_INCDIR_OPENGL = -+QMAKE_LIBDIR_OPENGL = - QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL --QMAKE_INCDIR_EGL = -+QMAKE_INCDIR_EGL = - QMAKE_LIBDIR_EGL = --QMAKE_INCDIR_OPENVG = -+QMAKE_INCDIR_OPENVG = - QMAKE_LIBDIR_OPENVG = - -+ - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl --QMAKE_LIBS_X11 = -lXext -lX11 -lm --QMAKE_LIBS_X11SM = -lSM -lICE -+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) - QMAKE_LIBS_NIS = -lnsl - QMAKE_LIBS_EGL = -lEGL - QMAKE_LIBS_OPENGL = -lGLU -lGL -@@ -35,10 +36,14 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 - QMAKE_LIBS_OPENVG = -lOpenVG - QMAKE_LIBS_THREAD = -lpthread - --QMAKE_MOC = $$[QT_INSTALL_BINS]/moc --QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -+QMAKE_MOC = $(OE_QMAKE_MOC) -+QMAKE_UIC = $(OE_QMAKE_UIC) -+QMAKE_UIC3 = $(OE_QMAKE_UIC3) -+QMAKE_RCC = $(OE_QMAKE_RCC) -+QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) -+QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) - --QMAKE_AR = ar cqs -+QMAKE_AR = $(OE_QMAKE_AR) cqs - QMAKE_OBJCOPY = objcopy - QMAKE_RANLIB = - -@@ -51,7 +56,7 @@ QMAKE_COPY_DIR = $(COPY) -r - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+QMAKE_STRIP = $(OE_QMAKE_STRIP) - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p --- -1.6.6.1 - |