diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-05-06 17:53:07 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-06 17:53:07 +0000 |
| commit | 574009f3b76ac859d173f5450b53a8b31d5ef1ca (patch) | |
| tree | 0ab2716ec1e40025cea1fcdd443d16cce24f756d | |
| parent | b7c0b97dec8d44496972003a3258654945872d29 (diff) | |
| parent | 90d7e5110319cc4ab6b5e47af5e989b58004ee2f (diff) | |
merge of 224e3cbcf014b8cd9406d30cb74a19c2d77cd5d6
and 253cbfe06dd468b449fb7cf63f7d91224be6c3d1
105 files changed, 2456 insertions, 149 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1728b65709..6a9077d55a 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 09b9cbac96..6e3d5f8ba2 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,11 +1,15 @@ +DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # # override variables set by qmake-base to compile Qt/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" + + diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 04aff565be..635fc67694 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,16 +1,17 @@ DEPENDS_prepend = "qmake2-native " +DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}" # # override variables set by qmake-base to compile Qt4/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" -export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" -export OE_QMAKE_QMAKE="${STAGING_BINDIR}/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_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" +export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4" +export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4" +export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/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_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/sip.bbclass b/classes/sip.bbclass index 7e049bc65a..adf179b130 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -1,6 +1,11 @@ -DEPENDS_prepend = "sip-native python-sip " +# Build Class for Sip based Python Bindings +# (C) Michael 'Mickey' Lauer <mickey@Vanille.de> +# -#EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" +DEPENDS =+ "sip-native python-sip" + +# default stuff, do not uncomment +# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" sip_do_generate() { if [ -z "${SIP_MODULES}" ]; then diff --git a/classes/sip4.bbclass b/classes/sip4.bbclass index d58c2d6381..ca2b1dae20 100644 --- a/classes/sip4.bbclass +++ b/classes/sip4.bbclass @@ -1,5 +1,10 @@ -DEPENDS_prepend = "sip4-native " -RDEPENDS_append = "python-sip4" +# Build Class for Sip based Python Bindings +# (C) Michael 'Mickey' Lauer <mickey@Vanille.de> +# +DEPENDS =+ "sip4-native" +RDEPENDS += "python-sip4" + +# default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1" sip4_do_generate() { diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 1f1be076c9..c80a574a0d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -15,6 +15,7 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" SRCDATE = "20060425" +SRCDATE_handhelds-pxa-2.6 = "20060506" # Opie diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index acb055eb42..b1591efadd 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -36,7 +36,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "3.6" +SLUGOS_VERSION = "3.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index b6fba3498d..d24324a598 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -13,7 +13,7 @@ XSERVER = "xserver-kdrive-omap" GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-arm926ejs.conf +#includ |