summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-08-14 11:34:53 +0000
committerKoen Kooi <koen@openembedded.org>2007-08-14 11:34:53 +0000
commit0c138f4a7131723db2a6c061eeafc13388f55bed (patch)
treef635f4b4420c23ef2f37ebd88c089ecb91e21a1b
parent6a95f5f018046d58290aa926c160222bad6821b2 (diff)
parent25ff09c94a8f2faea23bfb20760a682bc6c03f87 (diff)
merge of '0c14edad9fe9be01f3dcd8bb7481391246756938'
and 'afa51d1bd3a6d0684595da996d34d4923676187f'
-rw-r--r--conf/distro/angstrom-2008.1.conf20
-rw-r--r--packages/sylpheed/claws-mail.inc8
2 files changed, 10 insertions, 18 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7fc656fb5e..dcf224f798 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -18,19 +18,19 @@ require conf/distro/angstrom-2007.1.conf
DISTRO_VERSION = "2008.1-test-${DATE}"
DISTRO_REVISION = "0"
-PREFERRED_VERSION_gcc ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross ?= "4.2.1"
+PREFERRED_VERSION_gcc = "4.2.1"
+PREFERRED_VERSION_gcc-cross = "4.2.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+PREFERRED_VERSION_linux-libc-headers = "2.6.22"
-#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.6"
-PREFERRED_VERSION_glibc-intermediate ?= "2.6"
-PREFERRED_VERSION_glibc-initial ?= "2.6"
+#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
+PREFERRED_VERSION_glibc = "2.6"
+PREFERRED_VERSION_glibc-intermediate = "2.6"
+PREFERRED_VERSION_glibc-initial = "2.6"
diff --git a/packages/sylpheed/claws-mail.inc b/packages/sylpheed/claws-mail.inc
index e62ca9036a..d8b3a2bc72 100644
--- a/packages/sylpheed/claws-mail.inc
+++ b/packages/sylpheed/claws-mail.inc
@@ -33,19 +33,11 @@ CFLAGS += "-D_GNU_SOURCE"
inherit autotools pkgconfig
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
do_install_append() {
install -d ${D}${datadir}/applications
install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
install -d ${D}${datadir}/pixmaps
install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
- mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN}
}
do_stage () {