From 1eac4dda40a4e1c542e4a6fd32ad3b86cce92653 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 24 Nov 2009 10:15:00 +0100
Subject: gcc 4.3.3: fix patch and packaging

---
 recipes/gcc/gcc-4.3.3/arm-gcc-objective.patch | 12 +-----------
 recipes/gcc/gcc-package-target.inc            |  9 ++++++++-
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'recipes')

diff --git a/recipes/gcc/gcc-4.3.3/arm-gcc-objective.patch b/recipes/gcc/gcc-4.3.3/arm-gcc-objective.patch
index 52fc22a575..ae8238bd40 100644
--- a/recipes/gcc/gcc-4.3.3/arm-gcc-objective.patch
+++ b/recipes/gcc/gcc-4.3.3/arm-gcc-objective.patch
@@ -1,13 +1,3 @@
---- gcc-4.3.1/configure.old	2009-04-21 22:13:11.000000000 -0700
-+++ gcc-4.3.1/configure	2009-04-21 22:14:20.000000000 -0700
-@@ -2251,7 +2251,6 @@
-     ;;
-   arm*-*-linux-gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
--    noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-     esac
 --- gcc-4.3.1/libobjc/exception.c.old	2009-04-21 22:13:18.000000000 -0700
 +++ gcc-4.3.1/libobjc/exception.c	2009-04-21 22:23:52.000000000 -0700
 @@ -31,7 +31,14 @@
@@ -278,4 +268,4 @@
 +	  sizeof (__objc_exception_class));
    header->base.exception_cleanup = __objc_exception_cleanup;
    header->value = value;
- 
\ No newline at end of file
+ 
diff --git a/recipes/gcc/gcc-package-target.inc b/recipes/gcc/gcc-package-target.inc
index 17e9c28c1c..91f5f9060d 100644
--- a/recipes/gcc/gcc-package-target.inc
+++ b/recipes/gcc/gcc-package-target.inc
@@ -4,6 +4,7 @@ PACKAGES = "\
   cpp cpp-symlinks \
   g77 g77-symlinks \
   gfortran gfortran-symlinks \
+  objc objc-dev \
   gcov gcov-symlinks \
   libmudflap libmudflap-dev \
   libgcc-dev \
@@ -17,7 +18,6 @@ FILES_${PN} = "\
   ${bindir}/${TARGET_PREFIX}gcc \
   ${bindir}/${TARGET_PREFIX}gccbug \
   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
-  ${libdir}/libobjc* \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
@@ -88,6 +88,13 @@ FILES_libgfortran-dev = "${libdir}/libgfortran.a \
                          ${libdir}/libgfortran.so \
                          ${libdir}/libgfortranbegin.a"
 
+FILES_objc = "${libdir}/libobjc*.so.* \
+"
+FILES_objc-dev = "${libdir}/libobjc*.so \
+  ${libdir}/libobjc*.la \
+  ${libdir}/libobjc*.a \
+"
+
 FILES_libmudflap = "${libdir}/libmudflap*.so.*"
 FILES_libmudflap-dev = "\
   ${libdir}/libmudflap*.so \
-- 
cgit 1.2.3-korg