From e0b6b528a0d85f6cf9a62c4e49515a69d6c1c9bd Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 24 Jan 2008 10:36:34 +0000
Subject: gcc: Clean up 2005q3-2 version

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3578 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../gcc/gcc-cross-initial_csl-arm-2005q3-2.bb      |  2 ++
 .../gcc-3.4.4-makefile-fix.patch                   | 29 ++++++++++++++++++++++
 .../gcc-3.4.4-makefile-fix.patch                   | 29 ----------------------
 .../gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb       |  5 ++++
 meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb    |  3 +--
 5 files changed, 37 insertions(+), 31 deletions(-)
 create mode 100644 meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb
 create mode 100644 meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3-2/gcc-3.4.4-makefile-fix.patch
 delete mode 100644 meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3/gcc-3.4.4-makefile-fix.patch
 create mode 100644 meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb

(limited to 'meta/packages')

diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb
new file mode 100644
index 0000000000..1639511362
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2005q3-2.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
diff --git a/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3-2/gcc-3.4.4-makefile-fix.patch b/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3-2/gcc-3.4.4-makefile-fix.patch
new file mode 100644
index 0000000000..74c1f26833
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3-2/gcc-3.4.4-makefile-fix.patch
@@ -0,0 +1,29 @@
+--- gcc-3.4.4/gcc/Makefile.in.orig	2005-07-25 21:00:37 +0200
++++ gcc-3.4.4/gcc/Makefile.in	2005-07-25 21:01:19 +0200
+@@ -304,7 +304,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo ar; \
+     else \
+-       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
++       t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \
+     fi; \
+   fi`
+ AR_FLAGS_FOR_TARGET =
+@@ -317,7 +317,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo $(RANLIB); \
+     else \
+-       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
++       t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \
+     fi; \
+   fi`
+ NM_FOR_TARGET = ` \
+@@ -329,7 +329,7 @@
+     if [ "$(host)" = "$(target)" ] ; then \
+       echo nm; \
+     else \
+-       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
++       t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \
+     fi; \
+   fi`
+ 
diff --git a/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3/gcc-3.4.4-makefile-fix.patch b/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3/gcc-3.4.4-makefile-fix.patch
deleted file mode 100644
index 74c1f26833..0000000000
--- a/meta/packages/gcc/gcc-cross-kernel-3.4.4+csl-arm-2005q3/gcc-3.4.4-makefile-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gcc-3.4.4/gcc/Makefile.in.orig	2005-07-25 21:00:37 +0200
-+++ gcc-3.4.4/gcc/Makefile.in	2005-07-25 21:01:19 +0200
-@@ -304,7 +304,7 @@
-     if [ "$(host)" = "$(target)" ] ; then \
-       echo ar; \
-     else \
--       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
-+       t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \
-     fi; \
-   fi`
- AR_FLAGS_FOR_TARGET =
-@@ -317,7 +317,7 @@
-     if [ "$(host)" = "$(target)" ] ; then \
-       echo $(RANLIB); \
-     else \
--       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
-+       t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \
-     fi; \
-   fi`
- NM_FOR_TARGET = ` \
-@@ -329,7 +329,7 @@
-     if [ "$(host)" = "$(target)" ] ; then \
-       echo nm; \
-     else \
--       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
-+       t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \
-     fi; \
-   fi`
- 
diff --git a/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb
new file mode 100644
index 0000000000..cf1542d1e7
--- /dev/null
+++ b/meta/packages/gcc/gcc-cross-kernel_csl-arm-2005q3-2.bb
@@ -0,0 +1,5 @@
+require gcc-cross-initial_${PV}.bb
+require gcc-cross-kernel.inc
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
diff --git a/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb b/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb
index d14419191c..f95e2e1177 100644
--- a/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb
+++ b/meta/packages/gcc/gcc-cross_csl-arm-2005q3-2.bb
@@ -1,11 +1,10 @@
-require gcc_csl-arm-2005q3.bb
+require gcc_csl-arm-2005q3-2.bb
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
 PR = "r0"
-PV = "3.4.4+csl-arm-2005q3-2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-- 
cgit v1.2.3-54-g00ecf