Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 94 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index be1dc0caab..be0f4ffac9 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13398,6 +13398,10 @@ sha256=84d7ca0331963d2b2be7e18af61a80f49653c692f0bad63c5d26b2a2f7bc3375
 md5=b930e7213b37acc934d0d163cf13af18
 sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c
 
+[http://llvm.org/releases/2.4/llvm-2.4.tar.gz]
+md5=bf43eee98c364fd79c7d2b72e645a15e
+sha256=5fc295b3cf3de019962aee3be1c5efb49d6bf5041dae59451f6c0f544eb36bdc
+
 [http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-2.10.1.tar.gz]
 md5=cdc857b78e813b88cbf8be92441aa299
 sha256=a332cacfa9d0eed6e9158c394db714e536f38c27451d7df08b9634952118fa1b
diff --git a/packages/llvm/llvm-2.4/fix-build.patch b/packages/llvm/llvm-2.4/fix-build.patch
new file mode 100644
index 0000000000..dee06f3c36
--- /dev/null
+++ b/packages/llvm/llvm-2.4/fix-build.patch
@@ -0,0 +1,35 @@
+Index: llvm-2.4/Makefile.rules
+===================================================================
+--- llvm-2.4.orig/Makefile.rules	2009-01-05 16:16:53.693946445 +0100
++++ llvm-2.4/Makefile.rules	2009-01-05 16:17:18.149945262 +0100
+@@ -436,7 +436,7 @@
+ ifdef EXAMPLE_TOOL
+   LD.Flags += -rpath $(ExmplDir) -export-dynamic
+ else
+-  LD.Flags += -rpath $(ToolDir) -export-dynamic
++  LD.Flags += -export-dynamic
+ endif
+ endif
+ 
+Index: llvm-2.4/lib/ExecutionEngine/JIT/JIT.cpp
+===================================================================
+--- llvm-2.4.orig/lib/ExecutionEngine/JIT/JIT.cpp	2009-01-05 15:36:34.901945895 +0100
++++ llvm-2.4/lib/ExecutionEngine/JIT/JIT.cpp	2009-01-05 15:39:21.580362436 +0100
+@@ -65,7 +65,7 @@
+ }
+ 
+ 
+-#if defined (__GNUC__)
++#if defined (__GNUC__) && ! defined (__ARM_EABI__)
+  
+ // libgcc defines the __register_frame function to dynamically register new
+ // dwarf frames for exception handling. This functionality is not portable
+@@ -225,7 +225,7 @@
+   }
+   
+   // Register routine for informing unwinding runtime about new EH frames
+-#if defined(__GNUC__)
++#if defined(__GNUC__) && ! defined(__ARM_EABI__)
+ #if defined(__APPLE__)
+   struct LibgccObjectInfo* LOI = (struct LibgccObjectInfo*)
+     _keymgr_get_and_lock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST);
diff --git a/packages/llvm/llvm_2.4.bb b/packages/llvm/llvm_2.4.bb
new file mode 100644
index 0000000000..d06e4a3f74
--- /dev/null
+++ b/packages/llvm/llvm_2.4.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "The Low Level Virtual Machine"
+HOMEPAGE = "http://llvm.org"
+LICENSE = "various"
+
+SRC_URI = "\
+	http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz \
+	file://fix-build.patch;patch=1 \
+	"
+
+DEPENDS = "llvm-native"
+
+inherit autotools
+
+do_compile() {
+	# tblgen doesnt want to link correctly. Pull the one in we have in staging.
+	install -d Release/Build/bin
+	cp ${STAGING_BINDIR_NATIVE}/tblgen Release/Build/bin
+	cp ${STAGING_BINDIR_NATIVE}/fpcmp Release/Build/bin
+	cp ${STAGING_BINDIR_NATIVE}/llvm-PerfectShuffle Release/Build/bin
+	install -d Release/Build/lib
+	touch Release/Build/lib/libLLVMSupport.a
+	touch Release/Build/lib/libLLVMSystem.a
+	
+	oe_runmake
+}
+
+do_stage() {
+	autotools_stage_all
+
+	rm ${STAGING_LIBDIR}/LLVMHello.*
+
+	install -d ${STAGING_BINDIR_CROSS}
+
+	sed -e's^my.*ABS_RUN_DIR =.*^my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";^' \
+		-e's^my.*INCLUDEDIR =.*^my $INCLUDEDIR = "${STAGING_INCDIR}";^' \
+		-e's^my.*LIBDIR.*^my $LIBDIR = "${STAGING_LIBDIR}";^' \
+		-e's^my.*BINDIR.*^my $BINDIR = "${STAGING_BINDIR}";^' \
+		Release/Host/bin/llvm-config > ${STAGING_BINDIR_CROSS}/llvm-config
+
+	chmod +x ${STAGING_BINDIR_CROSS}/llvm-config
+}	
+
diff --git a/packages/maemo/xsp/xsp-fix-pc.patch b/packages/maemo/xsp/xsp-fix-pc.patch
new file mode 100644
index 0000000000..18bc67cdd9
--- /dev/null
+++ b/packages/maemo/xsp/xsp-fix-pc.patch
@@ -0,0 +1,10 @@
+--- Xsp/xsp.pc.in~	2009-01-07 13:06:07.000000000 +0100
++++ Xsp/xsp.pc.in	2009-01-07 13:06:07.000000000 +0100
+@@ -6,5 +6,5 @@
+ Name: Xsp
+ Description: X Sputnik Library
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${includedir}  @XSP_CFLAGS@ @X_CFLAGS@
+-Libs: -L${libdir} -lXsp @XSP_LIBS@ @X_LIBS@
++Cflags: -I${includedir}
++Libs: -L${libdir} -lXsp -lX11
diff --git a/packages/maemo/xsp_1.0.0-8.bb b/packages/maemo/xsp_1.0.0-8.bb
index f4f872e57f..50de83c204 100644
--- a/packages/maemo/xsp_1.0.0-8.bb
+++ b/packages/maemo/xsp_1.0.0-8.bb
@@ -1,11 +1,12 @@
-PR = "r1"
+PR = "r2"
 LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libxext xpext"
 
-SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz \
+           file://xsp-fix-pc.patch;patch=1"
 S = "${WORKDIR}/Xsp"
 
 inherit autotools pkgconfig