aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-16 14:42:15 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-16 14:42:15 +0200
commita2680a0a360dc071c9ca775fa0e19a17b46c06cd (patch)
treee3fbb132c939bace8f88cc4d4ea40478bc6d7dd9
parent77623602a270af4c73e41a7ea12ec97c0fbf6b7a (diff)
parent8fa95dc3f6c3a06cb0ada1fc0e8269c4b1309f90 (diff)
downloadopenembedded-a2680a0a360dc071c9ca775fa0e19a17b46c06cd.tar.gz
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--classes/java.bbclass2
-rw-r--r--classes/siteinfo.bbclass1
-rw-r--r--recipes/odcctools/odcctools-cross-sdk_svn.bb22
-rw-r--r--recipes/odcctools/odcctools-cross_svn.bb18
4 files changed, 42 insertions, 1 deletions
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 38256d7798..cacd2ce525 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -72,7 +72,7 @@ oe_jarinstall() {
oewarn "file was in the way. removing:" $dir/$1
rm $dir/$1
fi
- ln -s $destname $dir/$1
+ ln -sf $destname $dir/$1
shift
done
}
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index 55ab371af3..82a1616d05 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -26,6 +26,7 @@ def get_siteinfo_list(d):
"armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\
"armeb-linux-uclibcgnueabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\
"arm-darwin": "endian-little bit-32 common-darwin",\
+ "arm-darwin9": "endian-little bit-32 common-darwin",\
"arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\
"arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\
"arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\
diff --git a/recipes/odcctools/odcctools-cross-sdk_svn.bb b/recipes/odcctools/odcctools-cross-sdk_svn.bb
new file mode 100644
index 0000000000..5c34783490
--- /dev/null
+++ b/recipes/odcctools/odcctools-cross-sdk_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "cctools for darwin (SDK)"
+HOMEPAGE = "http://code.google.com/p/iphone-dev"
+DEPENDS = "bison-native"
+PV = "0.0+svn${SRCREV}"
+PR = "r2"
+
+SRCREV="280"
+SRC_URI = "svn://iphone-dev.googlecode.com/svn/branches;proto=http;module=odcctools-9.2-ld"
+
+S = "${WORKDIR}/odcctools-9.2-ld"
+
+inherit autotools sdk
+
+EXTRA_OECONF = "--disable-ld64"
+
+do_install_append () {
+ install -d "${D}${prefix}/${TARGET_SYS}/bin/"
+ for l in ${D}${bindir}/*; do
+ ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
+ done
+}
+
diff --git a/recipes/odcctools/odcctools-cross_svn.bb b/recipes/odcctools/odcctools-cross_svn.bb
new file mode 100644
index 0000000000..142b01f4b8
--- /dev/null
+++ b/recipes/odcctools/odcctools-cross_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "cctools for darwin"
+HOMEPAGE = "http://code.google.com/p/iphone-dev"
+DEPENDS = "cross-linkage bison-native"
+PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+PV = "0.0+svn${SRCREV}"
+PR = "r2"
+
+SRCREV="280"
+SRC_URI = "svn://iphone-dev.googlecode.com/svn/branches;proto=http;module=odcctools-9.2-ld"
+
+S = "${WORKDIR}/odcctools-9.2-ld"
+
+inherit cross autotools
+
+LDFLAGS += "-m32"
+CFLAGS += "-m32"
+EXTRA_OECONF += "--disable-ld64"
+