[oe-commits] Khem Raj : gcc-configure-sdk: Handle hardcoded /usr/include
git version control
git at git.openembedded.org
Thu Nov 25 22:49:54 UTC 2010
Module: openembedded.git
Branch: master
Commit: 3ad1829daa1466b40f8569d9299ab951f2f679a7
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3ad1829daa1466b40f8569d9299ab951f2f679a7
Author: Khem Raj <raj.khem at gmail.com>
Date: Thu Nov 25 14:47:58 2010 -0800
gcc-configure-sdk: Handle hardcoded /usr/include
This does not work for distros like micro who use
a flattened tree structure for root file system
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
recipes/gcc/gcc-configure-sdk.inc | 8 ++++++++
recipes/gcc/gcc-cross-sdk_4.1.0.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.1.1.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.1.2.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.2.2.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.2.3.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.2.4.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.3.1.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.3.2.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.3.3.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.3.4.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.4.1.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.4.2.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.4.4.bb | 2 +-
recipes/gcc/gcc-cross-sdk_4.5.bb | 2 +-
15 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc
index c8fae11..7210d2b 100644
--- a/recipes/gcc/gcc-configure-sdk.inc
+++ b/recipes/gcc/gcc-configure-sdk.inc
@@ -44,6 +44,14 @@ do_configure () {
sed -i 's/^\(HOST_LIBELFLIBS =\) \(.*\)$/\1 -Wl,-Bstatic \2 -Wl,-Bdynamic/' ${S}/Makefile.in
(cd ${S} && gnu-configize) || die "failure running gnu-configize"
+ # gcc assumes ${sysroot}/usr to be prefix on linux targets
+ # but we have distro option to flatten out the tree and micro
+ # uses root file system without leading /usr so we need to
+ # teach gcc configure to look in correct include paths
+ # unfortunately there is no configure knob to indicate this
+ # to configury hence the sed :(
+ sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure.ac
+ sed -i 's:/usr/include:${target_includedir}:g' ${S}/gcc/configure
oe_runconf
}
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb
index 9aa6a56..24c76b5 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,5 +1,5 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
require gcc-${PV}.inc
require gcc-cross-sdk.inc
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb
index 26eb80b..7ea943e 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
require gcc-${PV}.inc
require gcc-cross-sdk.inc
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb
index 2475f3e..b1525b3 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
require gcc-${PV}.inc
require gcc-cross-sdk.inc
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb
index eb30315..4ec237b 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb
index fbbfbce..62de382 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
index 28cdbb7..86ffc25 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb
index fbbfbce..62de382 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb
index fbbfbce..62de382 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
index 62de382..82bd95e 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb
index 1a2ed67..fbbfbce 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
inherit sdk
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb
index 77ccf72..9f8c75d 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb
@@ -2,7 +2,7 @@ inherit sdk
require gcc-${PV}.inc
require gcc-cross-sdk.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb
index 77ccf72..9f8c75d 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb
@@ -2,7 +2,7 @@ inherit sdk
require gcc-${PV}.inc
require gcc-cross-sdk.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.4.bb b/recipes/gcc/gcc-cross-sdk_4.4.4.bb
index 44abbcf..439ae36 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.4.bb
@@ -2,7 +2,7 @@ inherit sdk
require gcc-${PV}.inc
require gcc-cross-sdk.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
--disable-libgomp --disable-libmudflap \
diff --git a/recipes/gcc/gcc-cross-sdk_4.5.bb b/recipes/gcc/gcc-cross-sdk_4.5.bb
index f96607e..d1e13d4 100644
--- a/recipes/gcc/gcc-cross-sdk_4.5.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.5.bb
@@ -2,7 +2,7 @@ inherit sdk
require gcc-${PV}.inc
require gcc-cross-sdk.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib"
More information about the Openembedded-commits
mailing list