Patchwork [v3] libtool: fix resolve of lt_sysroot

login
register
mail settings
Submitter Hans Beckérus
Date Sept. 10, 2013, 11:31 a.m.
Message ID <00D40DBB-D50A-44EE-B939-8EC0AD1024EB@gmail.com>
Download mbox | patch
Permalink /patch/57747/
State New
Headers show

Comments

Hans Beckérus - Sept. 10, 2013, 11:31 a.m.
This patch updates libtool.m4 (and its output) to resolve a problem
with variable 'lt_sysroot' not being properly updated if the option
'--with[-libtool]-sysroot' is not provided when running the 'configure'
script for a package.
 
According to the help text ouput from 'configure':
--with-libtool-sysroot=DIR Search for dependent libraries within DIR
                       (or the compiler's sysrooot if not specified).
 
Due to swapped cases in a switch statement, when checking if the option
was specified or not, wrong actions were taken resulting in an
incorrect sysroot and failures to properly locate e.g. .la files.
 
For current upstream status see:
http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
 
Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
---
meta/recipes-devtools/libtool/libtool-2.4.2.inc    |  1 +
.../libtool/libtool/fix-resolve-lt-sysroot.patch   | 35 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
 
--
1.8.3.3
Hans Beckérus - Sept. 10, 2013, 11:44 a.m.
Could someone please verify if this patch (original v3 post) can be
saved without line-feed corruption? It seems very client dependent how
a message is saved, irrespective of source format. Some client seems
to cut lines like crazy, others does not.

Thanks.
Hans



On Tue, Sep 10, 2013 at 1:31 PM, Hans Beckérus <hans.beckerus@gmail.com> wrote:
>
> This patch updates libtool.m4 (and its output) to resolve a problem
>
> with variable 'lt_sysroot' not being properly updated if the option
>
> '--with[-libtool]-sysroot' is not provided when running the 'configure'
>
> script for a package.
>
>
>
> According to the help text ouput from 'configure':
>
> --with-libtool-sysroot=DIR Search for dependent libraries within DIR
>
>                        (or the compiler's sysrooot if not specified).
>
>
>
> Due to swapped cases in a switch statement, when checking if the option
>
> was specified or not, wrong actions were taken resulting in an
>
> incorrect sysroot and failures to properly locate e.g. .la files.
>
>
>
> For current upstream status see:
>
> http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
>
>
>
> Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
>
> ---
>
> meta/recipes-devtools/libtool/libtool-2.4.2.inc    |  1 +
>
> .../libtool/libtool/fix-resolve-lt-sysroot.patch   | 35
> ++++++++++++++++++++++
>
> 2 files changed, 36 insertions(+)
>
> create mode 100644
> meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
>
>
>
> diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
> b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
>
> index bb4ddf0..92e4949 100644
>
> --- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
>
> +++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
>
> @@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
>
>                   file://respect-fstack-protector.patch \
>
>             file://norm-rpath.patch \
>
>             file://dont-depend-on-help2man.patch \
>
> +           file://fix-resolve-lt-sysroot.patch \
>
>            "
>
>  SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
>
> diff --git
> a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
> b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
>
> new file mode 100644
>
> index 0000000..5a6335b
>
> --- /dev/null
>
> +++ b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
>
> @@ -0,0 +1,35 @@
>
> +
>
> +Upstream-Status: Pending
>
> +
>
> +This patch updates libtool.m4 (and its output) to resolve a problem
>
> +with variable 'lt_sysroot' not being properly updated if the option
>
> +'--with[-libtool]-sysroot' is not provided when running the 'configure'
>
> +script for a package.
>
> +
>
> +I have also reported the problem to libtool here
>
> +
>
> +http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
>
> +
>
> +Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
>
> +---
>
> +diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4
> libtool-2.4.2/libltdl/m4/libtool.m4
>
> +--- libtool-2.4.2.orig/libltdl/m4/libtool.m4           2013-09-05
> 10:37:24.690013000 +0200
>
> ++++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-09-05 12:05:51.560281000 +0200
>
> +@@ -1234,7 +1234,7 @@
>
> + dnl in case the user passed a directory name.
>
> + lt_sysroot=
>
> + case ${with_libtool_sysroot} in #(
>
> +- yes)
>
> ++ no)
>
> +    if test "$GCC" = yes; then
>
> +      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
>
> +    fi
>
> +@@ -1242,7 +1242,7 @@
>
> +  /*)
>
> +    lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
>
> +    ;; #(
>
> +- no|'')
>
> ++ yes|'')
>
> +    ;; #(
>
> +  *)
>
> +    AC_MSG_RESULT([${with_libtool_sysroot}])
>
> --
>
> 1.8.3.3
Paul Barker - Sept. 10, 2013, noon
On 10 September 2013 12:44, Hans Beckérus <hans.beckerus@gmail.com> wrote:
> Could someone please verify if this patch (original v3 post) can be
> saved without line-feed corruption? It seems very client dependent how
> a message is saved, irrespective of source format. Some client seems
> to cut lines like crazy, others does not.
>
> Thanks.
> Hans
>

Looking at "Show Original" in gmail still shows this to be garbled.
Perhaps save it as a .patch file and attach that to an email? That
should prevent any mail client from touching it.
Hans Beckérus - Sept. 10, 2013, 12:06 p.m.
On Tue, Sep 10, 2013 at 2:00 PM, Paul Barker <paul@paulbarker.me.uk> wrote:
> On 10 September 2013 12:44, Hans Beckérus <hans.beckerus@gmail.com> wrote:
>> Could someone please verify if this patch (original v3 post) can be
>> saved without line-feed corruption? It seems very client dependent how
>> a message is saved, irrespective of source format. Some client seems
>> to cut lines like crazy, others does not.
>>
>> Thanks.
>> Hans
>>
>
> Looking at "Show Original" in gmail still shows this to be garbled.
> Perhaps save it as a .patch file and attach that to an email? That
> should prevent any mail client from touching it.
>
Oh. But hang on here. Is it allowed to commit patches in the form of
an attachment?
Then why are we at all messing with the formatting and using git
send-email to avoid white-spaces etc?
If attachments are allowed then that will definitely save me some work ;)

Thanks.
Hans


> --
> Paul Barker
>
> Email: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk
Paul Barker - Sept. 10, 2013, 12:13 p.m.
On 10 September 2013 13:06, Hans Beckérus <hans.beckerus@gmail.com> wrote:
> On Tue, Sep 10, 2013 at 2:00 PM, Paul Barker <paul@paulbarker.me.uk> wrote:
>> On 10 September 2013 12:44, Hans Beckérus <hans.beckerus@gmail.com> wrote:
>>> Could someone please verify if this patch (original v3 post) can be
>>> saved without line-feed corruption? It seems very client dependent how
>>> a message is saved, irrespective of source format. Some client seems
>>> to cut lines like crazy, others does not.
>>>
>>> Thanks.
>>> Hans
>>>
>>
>> Looking at "Show Original" in gmail still shows this to be garbled.
>> Perhaps save it as a .patch file and attach that to an email? That
>> should prevent any mail client from touching it.
>>
> Oh. But hang on here. Is it allowed to commit patches in the form of
> an attachment?
> Then why are we at all messing with the formatting and using git
> send-email to avoid white-spaces etc?
> If attachments are allowed then that will definitely save me some work ;)
>

Ok, I've looked again and
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
doesn't mention attached patches as allowed. This is what the -contrib
repos were created for, perhaps you could request access to
http://git.openembedded.org/openembedded-core-contrib/ and push a
branch there, then send a pull request.
Hans Beckérus - Sept. 10, 2013, 12:30 p.m.
On Tue, Sep 10, 2013 at 2:13 PM, Paul Barker <paul@paulbarker.me.uk> wrote:
> On 10 September 2013 13:06, Hans Beckérus <hans.beckerus@gmail.com> wrote:
>> On Tue, Sep 10, 2013 at 2:00 PM, Paul Barker <paul@paulbarker.me.uk> wrote:
>>> On 10 September 2013 12:44, Hans Beckérus <hans.beckerus@gmail.com> wrote:
>>>> Could someone please verify if this patch (original v3 post) can be
>>>> saved without line-feed corruption? It seems very client dependent how
>>>> a message is saved, irrespective of source format. Some client seems
>>>> to cut lines like crazy, others does not.
>>>>
>>>> Thanks.
>>>> Hans
>>>>
>>>
>>> Looking at "Show Original" in gmail still shows this to be garbled.
>>> Perhaps save it as a .patch file and attach that to an email? That
>>> should prevent any mail client from touching it.
>>>
>> Oh. But hang on here. Is it allowed to commit patches in the form of
>> an attachment?
>> Then why are we at all messing with the formatting and using git
>> send-email to avoid white-spaces etc?
>> If attachments are allowed then that will definitely save me some work ;)
>>
>
> Ok, I've looked again and
> http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
> doesn't mention attached patches as allowed. This is what the -contrib
> repos were created for, perhaps you could request access to
> http://git.openembedded.org/openembedded-core-contrib/ and push a
> branch there, then send a pull request.
>
Yes, or I will just try to find a simple stupid mail client that does
not mess up the formatting.
I will try later today from a different client. That will be the last
attempt. I am making a complete fool out of myself already ;)

Thanks.
Hans

> --
> Paul Barker
>
> Email: paul@paulbarker.me.uk
> http://www.paulbarker.me.uk
Paul Barker - Sept. 10, 2013, 12:38 p.m.
On 10 September 2013 13:30, Hans Beckérus <hans.beckerus@gmail.com> wrote:
> Yes, or I will just try to find a simple stupid mail client that does
> not mess up the formatting.
> I will try later today from a different client. That will be the last
> attempt. I am making a complete fool out of myself already ;)
>

You should have seen the first patches I posted! Don't worry about
looking like a fool, we were all new to this at some point.

Patch

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index bb4ddf0..92e4949 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -20,6 +20,7 @@  SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
                  file://respect-fstack-protector.patch \
            file://norm-rpath.patch \
            file://dont-depend-on-help2man.patch \
+           file://fix-resolve-lt-sysroot.patch \
           "
 SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
diff --git a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
new file mode 100644
index 0000000..5a6335b
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
@@ -0,0 +1,35 @@ 
+
+Upstream-Status: Pending
+
+This patch updates libtool.m4 (and its output) to resolve a problem
+with variable 'lt_sysroot' not being properly updated if the option
+'--with[-libtool]-sysroot' is not provided when running the 'configure'
+script for a package.
+
+I have also reported the problem to libtool here
+
+http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
+
+Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
+---
+diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4
+--- libtool-2.4.2.orig/libltdl/m4/libtool.m4           2013-09-05 10:37:24.690013000 +0200
++++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-09-05 12:05:51.560281000 +0200
+@@ -1234,7 +1234,7 @@
+ dnl in case the user passed a directory name.
+ lt_sysroot=
+ case ${with_libtool_sysroot} in #(
+- yes)
++ no)
+    if test "$GCC" = yes; then
+      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+    fi
+@@ -1242,7 +1242,7 @@
+  /*)
+    lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
+    ;; #(
+- no|'')
++ yes|'')
+    ;; #(
+  *)
+    AC_MSG_RESULT([${with_libtool_sysroot}])