From 6e715d8f2561a8fac492cc10528102608c64eb74 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 23 Dec 2007 00:23:57 +0000 Subject: Remove some GNUism and replace cp -a with cp -pPR (once again) I didn't touch the to be installed files, as we have GNU coreutils or at least a compatible busybox version on our targets so far. --- classes/xilinx-bsp.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass index fd09946061..f657e5be94 100644 --- a/classes/xilinx-bsp.bbclass +++ b/classes/xilinx-bsp.bbclass @@ -34,7 +34,7 @@ fi case "${XILINX_BOARD}" in ML403) oenote "ML403 board setup" - cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ + cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h ;; -- cgit v1.2.3 From 2d65566d32c3b889ad0d0e523f2e6c7f7ef41364 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 13:42:04 +0000 Subject: classes/qmake2,qtopia4core: Change the Qt include and library dir to match the new location/names --- classes/qmake2.bbclass | 5 ++--- classes/qtopia4core.bbclass | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index d0f59d2cd4..63d6faf782 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,7 +5,6 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" @@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 86bc7afc2f..d14e68bb64 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -4,8 +4,8 @@ inherit qmake2 # # override variables set by qmake-base to compile QtopiaCore apps # -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork " -- cgit v1.2.3 From 79e6dae1cb3b5367da8d375fa1cf2f8480b64e6e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 24 Dec 2007 23:55:27 +0000 Subject: classes/qmake2.bbclass: Remove the usage of the QTDIR from this line as well (sadly no equivalent to git-commit --amend is available) --- classes/qmake2.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 63d6faf782..cf3419f824 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,7 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" -- cgit v1.2.3 From 701c1ca693343ff02d54556e1677ee9cc4d8f4ea Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 02:20:31 +0000 Subject: qmake,Qt/X11,QtopiaCore: Allow OE to set the tuning options. Allow to add a default module -Do not hardcode O2, we have flags in OE to do such things and passing both didn't make sense -With QtopiaCore QtGui is using Tcp/Udp/Sockets for the QWS implementation. This means when building a gui application you will need the network module. Allow to add modules using environment variables. --- classes/qtopia4core.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index d14e68bb64..181973d72d 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -8,4 +8,4 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" -EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork " +export OE_QMAKE_EXTRA_MODULES = "network" -- cgit v1.2.3