diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2010-09-26 03:12:18 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-09-27 01:11:46 +0800 |
| commit | a0dd0010fcc10d83f0e181b62ed1049fcb0273b2 (patch) | |
| tree | ec218ca7078bb1b578043bbb50e90378c98d908d | |
| parent | e1b7d4670f0f05fe7c5e16512cf6b84dceaf67ea (diff) | |
| download | openembedded-a0dd0010fcc10d83f0e181b62ed1049fcb0273b2.tar.gz | |
qt-4.7.0: Update the spec files for Qt 4.7
The biggest change is the QMAKE_RPATH to QMAKE_LFLAGS_RPATH
rename that broke linking for us.
| -rw-r--r-- | recipes/qt4/qt-4.7.0/g++.conf | 6 | ||||
| -rw-r--r-- | recipes/qt4/qt-4.7.0/linux.conf | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/recipes/qt4/qt-4.7.0/g++.conf b/recipes/qt4/qt-4.7.0/g++.conf index 4e2fb8083c..266a69f720 100644 --- a/recipes/qt4/qt-4.7.0/g++.conf +++ b/recipes/qt4/qt-4.7.0/g++.conf @@ -4,6 +4,7 @@ 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 @@ -22,6 +23,7 @@ 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_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB @@ -32,6 +34,8 @@ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE 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 += @@ -41,7 +45,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_RPATH = -Wl,-rpath-link, +QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, QMAKE_PCH_OUTPUT_EXT = .gch diff --git a/recipes/qt4/qt-4.7.0/linux.conf b/recipes/qt4/qt-4.7.0/linux.conf index 90b8d65aba..a54135513b 100644 --- a/recipes/qt4/qt-4.7.0/linux.conf +++ b/recipes/qt4/qt-4.7.0/linux.conf @@ -13,6 +13,14 @@ 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_LIBDIR_EGL = +QMAKE_INCDIR_OPENVG = +QMAKE_LIBDIR_OPENVG = QMAKE_LIBS = @@ -20,8 +28,12 @@ QMAKE_LIBS_DYNLOAD = -ldl 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 QMAKE_LIBS_OPENGL_QT = -lGL +QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM +QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 +QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $(OE_QMAKE_MOC) |