gcc-4.5: Edit defaults.h in ${B} instead of ${S}, and t-oe in ${B}

This patches are from oe-core needed after shared sourcedir changes to
oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Khem Raj
2011-07-02 07:56:48 +00:00
committed by Koen Kooi
parent a7b8268b8f
commit 340cc366c7
2 changed files with 59 additions and 1 deletions
+2 -1
View File
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
PV = "4.5" PV = "4.5"
INC_PR = "r38" INC_PR = "r39"
# BINV should be incremented after updating to a revision # BINV should be incremented after updating to a revision
# after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made
@@ -216,6 +216,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://gcc-poison-parameters.patch \ file://gcc-poison-parameters.patch \
file://gcc-ppc-config-fix.patch \ file://gcc-ppc-config-fix.patch \
file://gcc-ppc-include-config-linux.h.patch \ file://gcc-ppc-include-config-linux.h.patch \
file://use-defaults.h-and-t-oe-in-B.patch \
" "
# Language Overrides # Language Overrides
@@ -0,0 +1,57 @@
Upstream-Status: Pending
Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
the source can be shared between gcc-cross-initial,
gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
---
gcc/Makefile.in | 2 +-
gcc/configure | 4 ++--
gcc/configure.ac | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d91f93a..03ee2bd 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -461,7 +461,7 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
xmake_file=@xmake_file@
-tmake_file=@tmake_file@
+tmake_file=@tmake_file@ ./t-oe
TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
diff --git a/gcc/configure b/gcc/configure
index f440fa2..dafb0c1 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10838,8 +10838,8 @@ for f in $tm_file; do
tm_include_list="${tm_include_list} $f"
;;
defaults.h )
- tm_file_list="${tm_file_list} \$(srcdir)/$f"
- tm_include_list="${tm_include_list} $f"
+ tm_file_list="${tm_file_list} ./$f"
+ tm_include_list="${tm_include_list} ./$f"
;;
* )
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
diff --git a/gcc/configure.ac b/gcc/configure.ac
index d003091..ba422e6 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1652,8 +1652,8 @@ for f in $tm_file; do
tm_include_list="${tm_include_list} $f"
;;
defaults.h )
- tm_file_list="${tm_file_list} \$(srcdir)/$f"
- tm_include_list="${tm_include_list} $f"
+ tm_file_list="${tm_file_list} ./$f"
+ tm_include_list="${tm_include_list} ./$f"
;;
* )
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
--
1.7.1