[oe-commits] org.oe.dev Qt4/QtopiaCore4: Backport QT_LIBINFIX to add a suffix to libraries. Adapt qmake
freyther commit
openembedded-commits at lists.openembedded.org
Thu Dec 27 03:35:40 UTC 2007
Qt4/QtopiaCore4: Backport QT_LIBINFIX to add a suffix to libraries. Adapt qmake
Add the 'E' suffix to QtopiaCore libraries. This allows to install both
qtopiacore, qt/X11 at the same time.
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 9374f52664bf8a853a6627bbfbfb8a205b757138
ViewMTN: http://monotone.openembedded.org/revision/info/9374f52664bf8a853a6627bbfbfb8a205b757138
Files:
1
packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch
packages/qt4/files/0008-backport-qt-lib-infix.patch
classes/qtopia4core.bbclass
packages/qmake/qmake2-native.inc
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_configuration.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
packages/qt4/qtopia-core_4.3.3.bb
Diffs:
#
# mt diff -r39f105b1deaa93cf149139a4484fa278538ca7ad -r9374f52664bf8a853a6627bbfbfb8a205b757138
#
#
#
# add_file "packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch"
# content [61f4bf073b36988cf5d849c4968fd0231668ec5e]
#
# add_file "packages/qt4/files/0008-backport-qt-lib-infix.patch"
# content [38b864fb3010c2de2fe5c5a47fa3bae0247094b0]
#
# patch "classes/qtopia4core.bbclass"
# from [5f82061b34d43b07d4b472e008ae6c9b41f31ffc]
# to [b1d6e66685818c4024d7bfabaf21b47344f94360]
#
# patch "packages/qmake/qmake2-native.inc"
# from [d58b0ef825d0f6d7d1a0103da1b2ec0e903de4b2]
# to [fddea3b5f77f8297595bf49e8c4424d359cb4d8c]
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [4999377acbce5c192356f465789adc625e3135f3]
# to [4659f983944ce6319310e2accb2194a030d39fe6]
#
# patch "packages/qt4/qt_configuration.inc"
# from [5abde732116982782ed3a94ede56bf274012fc1f]
# to [cce5b8ce2ed155407f5e1cc3cec47337b54bef86]
#
# patch "packages/qt4/qt_packaging.inc"
# from [6c277ec158a91be79bb7e6484f8610fdc85e729c]
# to [fe6ac1892555890ed97bb2e3b8cb75239b6a442b]
#
# patch "packages/qt4/qt_staging.inc"
# from [426479a75ece31757e047679175820b2fdf3fcfb]
# to [138e3742b0fa71c3307af21a755fcc6e6f9c90da]
#
# patch "packages/qt4/qtopia-core.inc"
# from [c772ab48d1d0aed43a6f098861d9c762e9dd4f32]
# to [27e955f9b1f75f8581de52f9d083dd2df2ec13fa]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [79b0ab4f4981a89ecb7eecc8556f7d53c2e6d671]
# to [9272f8ac29a03d2b11a73f4636b20468b3c281ec]
#
============================================================
--- packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch 61f4bf073b36988cf5d849c4968fd0231668ec5e
+++ packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch 61f4bf073b36988cf5d849c4968fd0231668ec5e
@@ -0,0 +1,33 @@
+diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
+index 32a7fd5..48d584f 100644
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) {
+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+ }
+- LINKAGE = -framework $${LIB_NAME}
++ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX}
+ } else:!qt_no_framework { #detection
+ for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
+ exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
+@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) {
+ }
+ isEmpty(LINKAGE) {
+ CONFIG(debug, debug|release) {
+- win32:LINKAGE = -l$${LIB_NAME}d
+- mac:LINKAGE = -l$${LIB_NAME}_debug
++ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
++ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
+ }
+- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}
++ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
+ }
+ !isEmpty(QMAKE_LSB) {
+ QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
+ QMAKE_LFLAGS *= -L/opt/lsb/lib
+- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}
++ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX}
+ }
+ LIBS += $$LINKAGE
+ export(LIBS)
============================================================
--- packages/qt4/files/0008-backport-qt-lib-infix.patch 38b864fb3010c2de2fe5c5a47fa3bae0247094b0
+++ packages/qt4/files/0008-backport-qt-lib-infix.patch 38b864fb3010c2de2fe5c5a47fa3bae0247094b0
@@ -0,0 +1,137 @@
+diff --git a/configure b/configure
+index c5bdc34..a52607f 100755
+--- a/configure
++++ b/configure
+@@ -782,6 +782,11 @@ while [ "$#" -gt 0 ]; do
+ VAR=endian
+ VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"`
+ ;;
++ -qtlibinfix)
++ VAR="qtlibinfix"
++ shift
++ VAL="$1"
++ ;;
+ -D?*|-D)
+ VAR="add_define"
+ if [ "$1" = "-D" ]; then
+@@ -903,6 +908,9 @@ while [ "$#" -gt 0 ]; do
+ libdir)
+ QT_INSTALL_LIBS="$VAL"
+ ;;
++ qtlibinfix)
++ QT_LIBINFIX="$VAL"
++ ;;
+ translationdir)
+ QT_INSTALL_TRANSLATIONS="$VAL"
+ ;;
+@@ -2606,6 +2614,8 @@ fi
+ -no-sse ............ Do not compile with use of SSE instructions.
+ -no-sse2 ........... Do not compile with use of SSE2 instructions.
+
++ -qtlibinfix <infix> Renames all libQt*.so to libQt<infix>.so.
++
+ -D <string> ........ Add an explicit define to the preprocessor.
+ -I <string> ........ Add an explicit include path.
+ -L <string> ........ Add an explicit library path.
+@@ -5273,6 +5283,8 @@ QT_MAJOR_VERSION = $QT_MAJOR_VERSION
+ QT_MINOR_VERSION = $QT_MINOR_VERSION
+ QT_PATCH_VERSION = $QT_PATCH_VERSION
+
++QT_LIBINFIX = $QT_LIBINFIX
++
+ EOF
+ if [ "$CFG_RPATH" = "yes" ]; then
+ echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
+diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
+index 32a7fd5..48d584f 100644
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) {
+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+ }
+- LINKAGE = -framework $${LIB_NAME}
++ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX}
+ } else:!qt_no_framework { #detection
+ for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
+ exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
+@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) {
+ }
+ isEmpty(LINKAGE) {
+ CONFIG(debug, debug|release) {
+- win32:LINKAGE = -l$${LIB_NAME}d
+- mac:LINKAGE = -l$${LIB_NAME}_debug
++ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
++ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
+ }
+- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}
++ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
+ }
+ !isEmpty(QMAKE_LSB) {
+ QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT
+ QMAKE_LFLAGS *= -L/opt/lsb/lib
+- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}
++ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX}
+ }
+ LIBS += $$LINKAGE
+ export(LIBS)
+diff --git a/src/qbase.pri b/src/qbase.pri
+index 4db7e70..278e011 100644
+--- a/src/qbase.pri
++++ b/src/qbase.pri
+@@ -138,7 +138,7 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS QT_44_API_QSQLQUERY_FINISH
+ contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT
+ DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
+
+-TARGET = $$qtLibraryTarget($$TARGET) #do this towards the end
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
+
+ moc_dir.name = moc_location
+ moc_dir.variable = QMAKE_MOC
+diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
+index c121f28..83c3ed7 100644
+--- a/tools/assistant/lib/lib.pro
++++ b/tools/assistant/lib/lib.pro
+@@ -52,7 +52,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
+ }
+ }
+
+-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end
+
+ target.path=$$[QT_INSTALL_LIBS]
+ INSTALLS += target
+diff --git a/tools/designer/src/components/component.pri b/tools/designer/src/components/component.pri
+index 15c0cf2..78b075d 100644
+--- a/tools/designer/src/components/component.pri
++++ b/tools/designer/src/components/component.pri
+@@ -1,2 +1,2 @@
+
+-TARGET = $$qtLibraryTarget($$TARGET)
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX)
+diff --git a/tools/qdbus/src/src.pro b/tools/qdbus/src/src.pro
+index 47ef100..0669a46 100644
+--- a/tools/qdbus/src/src.pro
++++ b/tools/qdbus/src/src.pro
+@@ -70,7 +70,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
+ }
+ }
+
+-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end (after framework)
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end (after framework)
+
+ # Input
+
+diff --git a/tools/qtestlib/src/src.pro b/tools/qtestlib/src/src.pro
+index 5120a29..7d2082e 100644
+--- a/tools/qtestlib/src/src.pro
++++ b/tools/qtestlib/src/src.pro
+@@ -61,7 +61,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
+ }
+ }
+
+-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end (after framework)
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end (after framework)
+
+ # Input
+ HEADERS = qtest_global.h qtestcase.h qtestdata.h qtesteventloop.h
============================================================
--- classes/qtopia4core.bbclass 5f82061b34d43b07d4b472e008ae6c9b41f31ffc
+++ classes/qtopia4core.bbclass b1d6e66685818c4024d7bfabaf21b47344f94360
@@ -9,3 +9,4 @@ export OE_QMAKE_EXTRA_MODULES = "network
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = ""
export OE_QMAKE_EXTRA_MODULES = "network"
+EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
============================================================
--- packages/qmake/qmake2-native.inc d58b0ef825d0f6d7d1a0103da1b2ec0e903de4b2
+++ packages/qmake/qmake2-native.inc fddea3b5f77f8297595bf49e8c4424d359cb4d8c
@@ -10,6 +10,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
+ file://0008-backport-qt-lib-infix.patch;patch=1 \
file://qt-config.patch;patch=1 \
file://use-lflags-last.patch;patch=1 \
file://linux-oe-qmake.conf"
============================================================
--- packages/qt4/qt4-x11-free.inc 4999377acbce5c192356f465789adc625e3135f3
+++ packages/qt4/qt4-x11-free.inc 4659f983944ce6319310e2accb2194a030d39fe6
@@ -18,7 +18,6 @@ QT_BASE_LIB = "libqt"
QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
QT_BASE_NAME = "qt4"
QT_BASE_LIB = "libqt"
-QT_LIBRARY_NAME = "Qt"
QT_DIR_NAME = "qt4"
require qt_depends.inc
require qt_configuration.inc
============================================================
--- packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
+++ packages/qt4/qt_configuration.inc cce5b8ce2ed155407f5e1cc3cec47337b54bef86
@@ -1,12 +1,12 @@ QT_ENDIAN = "${@qt_endian(d)}"
require qt4_arch.inc
QT_ARCH := "${@qt_arch(d)}"
QT_ENDIAN = "${@qt_endian(d)}"
-QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \
- -shared -no-nas-sound -no-sm -no-nis \
- -qt-gif -system-libjpeg -system-libpng -system-zlib \
- -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
- -no-pch -qdbus -stl -glib"
+QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
+ -shared -no-nas-sound -no-sm -no-nis \
+ -qt-gif -system-libjpeg -system-libpng -system-zlib \
+ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
+ -no-pch -qdbus -stl -glib"
EXTRA_OEMAKE = "-e"
============================================================
--- packages/qt4/qt_packaging.inc 6c277ec158a91be79bb7e6484f8610fdc85e729c
+++ packages/qt4/qt_packaging.inc fe6ac1892555890ed97bb2e3b8cb75239b6a442b
@@ -60,56 +60,56 @@ def qt_default_dev(name):
RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}"
def qt_default_dev(name):
- return """${libdir}/lib${QT_LIBRARY_NAME}%(name)s.la
- ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.prl
- ${libdir}/lib${QT_LIBRARY_NAME}%(name)s.so
+ return """${libdir}/libQt%(name)s${QT_LIBINFIX}.la
+ ${libdir}/libQt%(name)s${QT_LIBINFIX}.prl
+ ${libdir}/libQt%(name)s${QT_LIBINFIX}.so
${includedir}/${QT_DIR_NAME}/Qt%(name)s*
- ${libdir}/pkgconfig/${QT_LIBRARY_NAME}%(name)s.pc""" % locals()
+ ${libdir}/pkgconfig/Qt%(name)s${QT_LIBINFIX}.pc""" % locals()
-FILES_${QT_BASE_LIB}core4 = "${libdir}/lib${QT_LIBRARY_NAME}Core.so.*"
+FILES_${QT_BASE_LIB}core4 = "${libdir}/libQtCore${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}core4-dev = "${@qt_default_dev('Core')}"
-FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Core*"
-FILES_${QT_BASE_LIB}gui4 = "${libdir}/lib${QT_LIBRARY_NAME}Gui.so.*"
+FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/libQtCore*"
+FILES_${QT_BASE_LIB}gui4 = "${libdir}/libQtGui${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}gui4-dev = "${@qt_default_dev('Gui')}"
-FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Gui*"
-FILES_${QT_BASE_LIB}network4 = "${libdir}/lib${QT_LIBRARY_NAME}Network.so.*"
+FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/libQtGui*"
+FILES_${QT_BASE_LIB}network4 = "${libdir}/libQtNetwork${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}network4-dev = "${@qt_default_dev('Network')}"
-FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Network*"
-FILES_${QT_BASE_LIB}sql4 = "${libdir}/lib${QT_LIBRARY_NAME}Sql.so.*"
+FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/libQtNetwork${QT_LIBINFIX}*"
+FILES_${QT_BASE_LIB}sql4 = "${libdir}/libQtSql${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}sql4-dev = "${@qt_default_dev('Sql')}"
-FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Sql*"
-FILES_${QT_BASE_LIB}svg4 = "${libdir}/lib${QT_LIBRARY_NAME}Svg.so.*"
+FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/libQtSql*"
+FILES_${QT_BASE_LIB}svg4 = "${libdir}/libQtSvg${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}svg4-dev = "${@qt_default_dev('Svg')}"
-FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Svg*"
-FILES_${QT_BASE_LIB}test4 = "${libdir}/lib${QT_LIBRARY_NAME}Test.so.*"
+FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/libQtSvg*"
+FILES_${QT_BASE_LIB}test4 = "${libdir}/libQtTest${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}test4-dev = "${@qt_default_dev('Test')}"
-FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Test*"
-FILES_${QT_BASE_LIB}xml4 = "${libdir}/lib${QT_LIBRARY_NAME}Xml.so.*"
+FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/libQtTest*"
+FILES_${QT_BASE_LIB}xml4 = "${libdir}/libQtXml${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}xml4-dev = "${@qt_default_dev('Xml')}"
-FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Xml*"
-FILES_${QT_BASE_LIB}designer4 = "${libdir}/lib${QT_LIBRARY_NAME}Designer.so.*"
+FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/libQtXml*"
+FILES_${QT_BASE_LIB}designer4 = "${libdir}/libQtDesigner${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}designer4-dev = "${@qt_default_dev('Designer')}"
-FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}Designer*"
-FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/lib${QT_LIBRARY_NAME}DesignerComponents.so.*"
+FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/libQtDesigner*"
+FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/libQtDesignerComponents${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}"
-FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/lib${QT_LIBRARY_NAME}DesignerComponents*"
-FILES_${QT_BASE_LIB}3support4 = "${libdir}/lib${QT_LIBRARY_NAME}3Support.so.*"
+FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/libQtDesignerComponents*"
+FILES_${QT_BASE_LIB}3support4 = "${libdir}/libQt3Support${QT_LIBINFIX}.so.*"
FILES_${QT_BASE_LIB}3support4-dev = "${@qt_default_dev('3Support')}"
-FILES_${QT_BASE_%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list