Patchwork [4/6] icu: Disable the default LDFLAGSICUDT for target compile

login
register
mail settings
Submitter Khem Raj
Date Feb. 17, 2014, 7:34 p.m.
Message ID <08134b74807c2647df869b226024213082332899.1392665521.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/66869/
State Accepted
Commit f5205c568cb0d29059c4d8c2dc200e435787f5d8
Headers show

Comments

Khem Raj - Feb. 17, 2014, 7:34 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |   28 ++++++++++++++++++++
 meta/recipes-support/icu/icu_51.2.bb               |    3 +++
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
Richard Purdie - Feb. 17, 2014, 9:53 p.m.
On Mon, 2014-02-17 at 11:34 -0800, Khem Raj wrote:

What appears to be missing here is an explanation of why we're doing
this? Its not in the patch header either...

Cheers,

Richard


> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |   28 ++++++++++++++++++++
>  meta/recipes-support/icu/icu_51.2.bb               |    3 +++
>  2 files changed, 31 insertions(+)
>  create mode 100644 meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
> 
> diff --git a/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
> new file mode 100644
> index 0000000..2968d57
> --- /dev/null
> +++ b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
> @@ -0,0 +1,28 @@
> +From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sat, 15 Feb 2014 21:06:42 +0000
> +Subject: [PATCH] Disable LDFLAGSICUDT for Linux
> +
> +Upstream-Status: Inappropriate [ OE Configuration ]
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + source/config/mh-linux |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/config/mh-linux b/config/mh-linux
> +index 366f0cc..2689aab 100644
> +--- a/config/mh-linux
> ++++ b/config/mh-linux
> +@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
> + LD_RPATH_PRE = -Wl,-rpath,
> + 
> + ## These are the library specific LDFLAGS
> +-LDFLAGSICUDT=-nodefaultlibs -nostdlib
> ++# LDFLAGSICUDT=-nodefaultlibs -nostdlib
> + 
> + ## Compiler switch to embed a library name
> + # The initial tab in the next line is to prevent icu-config from reading it.
> +-- 
> +1.7.10.4
> +
> diff --git a/meta/recipes-support/icu/icu_51.2.bb b/meta/recipes-support/icu/icu_51.2.bb
> index aabe07b..2d1fd42 100644
> --- a/meta/recipes-support/icu/icu_51.2.bb
> +++ b/meta/recipes-support/icu/icu_51.2.bb
> @@ -9,5 +9,8 @@ SRC_URI = "${BASE_SRC_URI} \
>             file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \
>            "
>  
> +SRC_URI_append_class-target = "\
> +           file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
> +          "
>  SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
>  SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
Khem Raj - Feb. 18, 2014, 12:10 a.m.
On Mon, Feb 17, 2014 at 1:53 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2014-02-17 at 11:34 -0800, Khem Raj wrote:
>
> What appears to be missing here is an explanation of why we're doing
> this? Its not in the patch header either...

right. should have done that, now I have pushed a newer patch with
some description in commit log
take a look

>
> Cheers,
>
> Richard
>
>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../0001-Disable-LDFLAGSICUDT-for-Linux.patch      |   28 ++++++++++++++++++++
>>  meta/recipes-support/icu/icu_51.2.bb               |    3 +++
>>  2 files changed, 31 insertions(+)
>>  create mode 100644 meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
>>
>> diff --git a/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
>> new file mode 100644
>> index 0000000..2968d57
>> --- /dev/null
>> +++ b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
>> @@ -0,0 +1,28 @@
>> +From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Sat, 15 Feb 2014 21:06:42 +0000
>> +Subject: [PATCH] Disable LDFLAGSICUDT for Linux
>> +
>> +Upstream-Status: Inappropriate [ OE Configuration ]
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> + source/config/mh-linux |    2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/config/mh-linux b/config/mh-linux
>> +index 366f0cc..2689aab 100644
>> +--- a/config/mh-linux
>> ++++ b/config/mh-linux
>> +@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
>> + LD_RPATH_PRE = -Wl,-rpath,
>> +
>> + ## These are the library specific LDFLAGS
>> +-LDFLAGSICUDT=-nodefaultlibs -nostdlib
>> ++# LDFLAGSICUDT=-nodefaultlibs -nostdlib
>> +
>> + ## Compiler switch to embed a library name
>> + # The initial tab in the next line is to prevent icu-config from reading it.
>> +--
>> +1.7.10.4
>> +
>> diff --git a/meta/recipes-support/icu/icu_51.2.bb b/meta/recipes-support/icu/icu_51.2.bb
>> index aabe07b..2d1fd42 100644
>> --- a/meta/recipes-support/icu/icu_51.2.bb
>> +++ b/meta/recipes-support/icu/icu_51.2.bb
>> @@ -9,5 +9,8 @@ SRC_URI = "${BASE_SRC_URI} \
>>             file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \
>>            "
>>
>> +SRC_URI_append_class-target = "\
>> +           file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
>> +          "
>>  SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
>>  SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
>
>

Patch

diff --git a/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
new file mode 100644
index 0000000..2968d57
--- /dev/null
+++ b/meta/recipes-support/icu/icu-51.2/0001-Disable-LDFLAGSICUDT-for-Linux.patch
@@ -0,0 +1,28 @@ 
+From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 15 Feb 2014 21:06:42 +0000
+Subject: [PATCH] Disable LDFLAGSICUDT for Linux
+
+Upstream-Status: Inappropriate [ OE Configuration ]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ source/config/mh-linux |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/mh-linux b/config/mh-linux
+index 366f0cc..2689aab 100644
+--- a/config/mh-linux
++++ b/config/mh-linux
+@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
+ LD_RPATH_PRE = -Wl,-rpath,
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++# LDFLAGSICUDT=-nodefaultlibs -nostdlib
+ 
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
+-- 
+1.7.10.4
+
diff --git a/meta/recipes-support/icu/icu_51.2.bb b/meta/recipes-support/icu/icu_51.2.bb
index aabe07b..2d1fd42 100644
--- a/meta/recipes-support/icu/icu_51.2.bb
+++ b/meta/recipes-support/icu/icu_51.2.bb
@@ -9,5 +9,8 @@  SRC_URI = "${BASE_SRC_URI} \
            file://add_buffer_length_check_to_UTF_16_or_32_detector.patch \
           "
 
+SRC_URI_append_class-target = "\
+           file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
+          "
 SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
 SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"