[poky] [PATCH 1/1] gcc/collect2: Added --sysroot support into collect2 in gcc.
Kamble, Nitin A
nitin.a.kamble at intel.com
Thu Mar 10 19:19:50 PST 2011
Looks fine to me.
Thanks,
Nitin
> -----Original Message-----
> From: poky-bounces at yoctoproject.org [mailto:poky-
> bounces at yoctoproject.org] On Behalf Of Lianhao Lu
> Sent: Wednesday, March 09, 2011 10:22 PM
> To: poky at yoctoproject.org
> Subject: [poky] [PATCH 1/1] gcc/collect2: Added --sysroot support into
> collect2 in gcc.
>
> From: Lianhao Lu <lianhao.lu at intel.com>
>
> [YOCTO #815] Added --sysroot into COLLECT_GCC_OPTIONS to allow the
> collect2 support user specifed sysroot.
>
> Signed-off-by: Lianhao Lu <lianhao.lu at intel.com>
> ---
> meta/recipes-devtools/gcc/gcc-4.5.1.inc | 1 +
> .../gcc/gcc-4.5.1/COLLECT_GCC_OPTIONS.patch | 22
> ++++++++++++++++++++
> .../gcc/gcc-cross-canadian_4.5.1.bb | 2 +-
> .../gcc/gcc-cross-initial_4.5.1.bb | 2 +-
> .../gcc/gcc-cross-intermediate_4.5.1.bb | 2 +-
> meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb | 2 +-
> .../gcc/gcc-crosssdk-initial_4.5.1.bb | 2 +-
> .../gcc/gcc-crosssdk-intermediate_4.5.1.bb | 2 +-
> meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb | 2 +-
> meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb | 2 +-
> meta/recipes-devtools/gcc/gcc_4.5.1.bb | 2 +-
> 11 files changed, 32 insertions(+), 9 deletions(-)
> create mode 100644 meta/recipes-devtools/gcc/gcc-
> 4.5.1/COLLECT_GCC_OPTIONS.patch
>
> diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc b/meta/recipes-
> devtools/gcc/gcc-4.5.1.inc
> index 6c600c1..3c4902e 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc
> +++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc
> @@ -56,6 +56,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-
> ${PV}.tar.bz2 \
> file://disable_relax_pic_calls_flag.patch \
> file://gcc-poison-parameters.patch \
> file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
> + file://COLLECT_GCC_OPTIONS.patch \
> "
>
> SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1
> "
> diff --git a/meta/recipes-devtools/gcc/gcc-
> 4.5.1/COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-
> 4.5.1/COLLECT_GCC_OPTIONS.patch
> new file mode 100644
> index 0000000..3e3dec7
> --- /dev/null
> +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/COLLECT_GCC_OPTIONS.patch
> @@ -0,0 +1,22 @@
> +#This patck added --sysroot into COLLECT_GCC_OPTIONS which is used to
> +#invoke collect2.
> +
> +diff -ruN gcc-4.5.1.orig/gcc/gcc.c gcc-4.5.1/gcc/gcc.c
> +--- gcc-4.5.1.orig/gcc/gcc.c 2011-03-09 16:43:39.127752586 +0800
> ++++ gcc-4.5.1/gcc/gcc.c 2011-03-09 16:47:15.894929459 +0800
> +@@ -4667,6 +4667,15 @@
> + sizeof ("COLLECT_GCC_OPTIONS=") - 1);
> +
> + first_time = TRUE;
> ++#ifdef HAVE_LD_SYSROOT
> ++ if (target_system_root_changed && target_system_root)
> ++ {
> ++ obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--
> sysroot=")-1);
> ++ obstack_grow (&collect_obstack,
> target_system_root,strlen(target_system_root));
> ++ obstack_grow (&collect_obstack, "'", 1);
> ++ first_time = FALSE;
> ++ }
> ++#endif
> + for (i = 0; (int) i < n_switches; i++)
> + {
> + const char *const *args;
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
> index 3eea4bc..92708d4 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb
> @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
> require gcc-configure-sdk.inc
> require gcc-package-sdk.inc
>
> -PR = "r3"
> +PR = "r4"
>
> DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-
> nativesdk"
> RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
> index 38e0964..081b7d6 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-cross-initial_4.5.1.bb
> @@ -1,5 +1,5 @@
> require gcc-cross_${PV}.bb
> require gcc-cross-initial.inc
>
> -PR = "r3"
> +PR = "r4"
>
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
> index 9a30cb5..a8473b0 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
> @@ -1,4 +1,4 @@
> require gcc-cross_${PV}.bb
> require gcc-cross-intermediate.inc
> -PR = "r4"
> +PR = "r5"
>
> diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
> index 78bb05a..af6daf4 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-cross_4.5.1.bb
> @@ -1,4 +1,4 @@
> -PR = "r3"
> +PR = "r4"
>
> require gcc-${PV}.inc
> require gcc-cross4.inc
> diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
> index fec53b9..9708248 100644
> --- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.5.1.bb
> @@ -1,4 +1,4 @@
> require gcc-cross-initial_${PV}.bb
> require gcc-crosssdk-initial.inc
>
> -PR = "r3"
> +PR = "r4"
> diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-
> intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-
> intermediate_4.5.1.bb
> index 161d870..d235969 100644
> --- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.5.1.bb
> @@ -1,4 +1,4 @@
> require gcc-cross-intermediate_${PV}.bb
> require gcc-crosssdk-intermediate.inc
>
> -PR = "r3"
> +PR = "r4"
> diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
> index 7069088..bae2389 100644
> --- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.5.1.bb
> @@ -1,4 +1,4 @@
> require gcc-cross_${PV}.bb
> require gcc-crosssdk.inc
>
> -PR = "r3"
> +PR = "r4"
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> index 093f9bf..c1e680d 100644
> --- a/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc-runtime_4.5.1.bb
> @@ -1,4 +1,4 @@
> -PR = "r2"
> +PR = "r3"
>
> require gcc-${PV}.inc
> require gcc-configure-runtime.inc
> diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-
> devtools/gcc/gcc_4.5.1.bb
> index 25e455c..a193b38 100644
> --- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
> +++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
> @@ -1,4 +1,4 @@
> -PR = "r3"
> +PR = "r4"
> require gcc-${PV}.inc
> require gcc-configure-target.inc
> require gcc-package-target.inc
> --
> 1.7.0.4
>
> _______________________________________________
> poky mailing list
> poky at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
More information about the poky
mailing list