diff options
author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 19:40:12 +0000 |
---|---|---|
committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-24 19:40:12 +0000 |
commit | 42bc77b481403b199b4b8090d285fa9a45d35745 (patch) | |
tree | 68bc011b9570976c4e3d2cb0ae3cd2a3beb71b11 /packages/qte | |
parent | 487b97bd54f28685ddc279a819492ee57f41946d (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/24 12:56:48-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded
2005/02/24 12:56:18-06:00 ti.com!kergoth
Apply gcc and qte fixes patch, courtesy Erik Andersen.
BKrev: 421e2d9c-cZcUG5dIcj9sFU7RpI-pQ
Diffstat (limited to 'packages/qte')
-rw-r--r-- | packages/qte/qte-2.3.10/key.patch | 0 | ||||
-rw-r--r-- | packages/qte/qte_2.3.10.bb | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/qte/qte-2.3.10/key.patch b/packages/qte/qte-2.3.10/key.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qte/qte-2.3.10/key.patch diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 83da55b3d5..f6777e0862 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_ramses = "zlib libpng jpeg uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://qpe.patch;patch=1 \ @@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://handhelds.patch;patch=1 \ file://qiconview-speed.patch;patch=1 \ file://sharp_char.h \ + file://key.patch;patch=1 \ file://switches.h " SRC_URI_append_simpad = "file://devfs.patch;patch=1 " @@ -84,6 +85,7 @@ export SYSCONF_CXX = "${CXX}" export SYSCONF_LINK = "${CCLD}" export SYSCONF_SHLIB = "${CCLD}" export SYSCONF_CFLAGS = "${CFLAGS}" +export SYSCONF_LINK_SHLIB = "${CXX}" export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES}" #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES}" export SYSCONF_LFLAGS = "${LDFLAGS} -lts" |