diff options
| author | Phil Blundell <philb@gnu.org> | 2009-06-10 13:38:50 +0100 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2009-06-10 13:38:50 +0100 |
| commit | d302cb3796aea6f77e3a32ae2e5d6c807ddbbcd0 (patch) | |
| tree | 419fb77d3d46f4f114eed6fff699d925ac17f734 | |
| parent | 7bde76df2e108a7ab597691cdb47b26fecc10cae (diff) | |
| parent | 0399441c0781eb912d6c375533fd60c69573809e (diff) | |
Merge branch 'org.openembedded.dev' of git@new.openembedded.org:openembedded into org.openembedded.dev
114 files changed, 3684 insertions, 953 deletions
diff --git a/classes/qt4e.bbclass b/classes/qt4e.bbclass index 445ecbaa6a..f72e06b6eb 100644 --- a/classes/qt4e.bbclass +++ b/classes/qt4e.bbclass @@ -2,15 +2,16 @@ DEPENDS_prepend = "${@["qt4-embedded ", ""][(bb.data.getVar('PN', d, 1) == 'qt4- inherit qmake2 QT_DIR_NAME = "qtopia" +QT_LIBINFIX = "E" # override variables set by qmake-base to compile Qt/Embedded apps # -export QMAKESPEC = "${STAGING_DATADIR}/qtopia/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" +export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" export OE_QMAKE_EXTRA_MODULES = "network" -EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E " +EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} " # Qt4 uses atomic instructions not supported in thumb mode ARM_INSTRUCTION_SET = "arm" diff --git a/conf/checksums.ini b/conf/checksums.ini index 62f5a77ce4..974b076c1d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7358,14 +7358,26 @@ sha256=8e46a48d581f8b835f305bb17ffbb7776d53b9214113524819e96be842f9db98 md5=44009c42e98943fbb868638032d5c8d6 sha256=6b9c73f34f498b12851ac32e1225b72228e4ea629d321b0426d505ad18309e54 +[http://geda.seul.org/release/v1.4/1.4.3/geda-docs-1.4.3.tar.gz] +md5=6305083c37a86f2353a8be40bcf70b99 +sha256=26e0d0aa9a24e75af57c27c5710521ed9005dcf4242d912ac0c497653b9a1959 + [http://geda.seul.org/release/v1.4/1.4.1/geda-examples-1.4.1.tar.gz] md5=9d3daac1be22186784929b56ea181738 sha256=29e3a1b65212b30847ac5c9f3d51a3add492a1597237085279b6ff82d1a1479f +[http://geda.seul.org/release/v1.4/1.4.3/geda-examples-1.4.3.tar.gz] +md5=923fe9d9cc843b5eb7b26c91ad0ef2d4 +sha256=38a7c6d39a8b298aa1baeadaf7a174ed2ae6397ef227f19cb0bee22757b6e553 +</ |