Return-Path: Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com [209.85.217.178]) by mail.openembedded.org (Postfix) with ESMTP id C95406B12F for ; Tue, 10 Sep 2013 11:31:40 +0000 (UTC) Received: by mail-lb0-f178.google.com with SMTP id z5so6100082lbh.37 for ; Tue, 10 Sep 2013 04:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:from:content-type:message-id:date:to :content-transfer-encoding:mime-version; bh=678pgtU6ryT89WNWOaj+QLytVQsB4PzG3qkM5f1qKVw=; b=X2hBcOyJxxfnUW1xDvGEzIbVpZuQGEcxs9yf/pXsZA0MEZf2qYaZG6ArzhE5/pw4yR BDj0Bz7T0iWYNjfaCD+aNU/9YlF4VPTUpEB++u5dKqKmLTIMU/m9ekTjBU0EiGGhHSaG l7+xrImzdsORaNltzAbQrymdlYR6ZPZY9/3GB5b/sBaG2nk5NIMGaDZtzTdPYZQlgSd3 CJwJZXMU1YBbQATZM56+vKGWSw+101J/DcSp7Djh4wajZLdHA4c6PhusxNP+HmCCRPLs 44JEjd1y+eP8CeQ0w6lqG7o6Oo/sPxJWmqsaFLbj3tbxmQ5dERIlS3xsL3jcE29OStlj yKPQ== X-Received: by 10.112.168.35 with SMTP id zt3mr20455332lbb.11.1378812697982; Tue, 10 Sep 2013 04:31:37 -0700 (PDT) Received: from [10.23.75.233] (c-5eeaaab7-74736162.cust.telenor.se. [94.234.170.183]) by mx.google.com with ESMTPSA id zc3sm8342800lbb.2.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 04:31:36 -0700 (PDT) From: =?utf-8?Q?Hans_Beck=C3=A9rus?= X-Mailer: iPhone Mail (10B329) Message-Id: <00D40DBB-D50A-44EE-B939-8EC0AD1024EB@gmail.com> Date: Tue, 10 Sep 2013 13:31:33 +0200 To: openembedded-core@lists.openembedded.org Mime-Version: 1.0 (1.0) Subject: [PATCH v3] libtool: fix resolve of lt_sysroot X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Sep 2013 11:31:42 -0000 Content-Type: multipart/alternative; boundary=Apple-Mail-D6895395-3F18-4ED2-A1B4-6F876DFA564A Content-Transfer-Encoding: 7bit --Apple-Mail-D6895395-3F18-4ED2-A1B4-6F876DFA564A Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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. =20 According to the help text ouput from 'configure': --with-libtool-sysroot=3DDIR Search for dependent libraries within DIR (or the compiler's sysrooot if not specified). =20 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. =20 For current upstream status see: http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html =20 Signed-off-by: Hans Beckerus --- 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-sysr= oot.patch =20 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 =3D "${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] =3D "d2f3b7d4627e69e13514a40e72a24d50" diff --git a/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.pa= tch 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 +--- +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=3D + case ${with_libtool_sysroot} in #( +- yes) ++ no) + if test "$GCC" =3D yes; then + lt_sysroot=3D`$CC --print-sysroot 2>/dev/null` + fi +@@ -1242,7 +1242,7 @@ + /*) + lt_sysroot=3D`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`= + ;; #( +- no|'') ++ yes|'') + ;; #( + *) + AC_MSG_RESULT([${with_libtool_sysroot}]) -- 1.8.3.3= --Apple-Mail-D6895395-3F18-4ED2-A1B4-6F876DFA564A Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable


This patch updates libtool.m4 (and its output) to res= olve a problem

with variable 'lt_sysroot' not being proper= ly updated if the option

'--with[-libtool]-sysroot' is not p= rovided when running the 'configure'

script for a package= .

 

According to the help text ouput from 'conf= igure':

--with-libtool-sysroot=3DDIR Search for dependent= libraries within DIR

      = ;            &nb= sp;    (or the compiler's sysrooot if not specified).

 

Due to swapped cases in a switch statement, when che= cking if the option

was specified or not, wrong actions w= ere taken resulting in an

incorrect sysroot and failures to p= roperly locate e.g. .la files.

 

For current up= stream status see:

http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg= 00005.html

 

Signed-off-by: Hans Be= ckerus <hans.beckerus at gmail.com>

---

= meta/recipes-devtools/libtool/libtool-2.4.2.inc    |  1 +=

.../libtool/libtool/fix-resolve-lt-sysroot.patch &n= bsp; | 35 ++++++++++++++++++++++

2 files changed, 36 inse= rtions(+)

create mode 100644 meta/recipes-devtools/libtoo= l/libtool/fix-resolve-lt-sysroot.patch

 

diff -= -git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtoo= ls/libtool/libtool-2.4.2.inc

index bb4ddf0..92e4949 10064= 4

--- 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 =3D "${GNU_MIRROR}/libtool/libtool-$= {PV}.tar.gz \

       &= nbsp;          file://respect-f= stack-protector.patch \

     &nbs= p;      file://norm-rpath.patch \=

=             file://do= nt-depend-on-help2man.patch \

+    &nb= sp;      file://fix-resolve-lt-sysroot.patch \=

           "=

 SRC_URI[md5sum] =3D "d2f3b7d46= 27e69e13514a40e72a24d50"

diff --git a/meta/recipes-devtools= /libtool/libtool/fix-resolve-lt-sysroot.patch b/meta/recipes-devtools/libtoo= l/libtool/fix-resolve-lt-sysroot.patch

new file mode 1006= 44

index 0000000..5a6335b

--- /dev/null

+++ b/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysro= ot.patch

@@ -0,0 +1,35 @@

+<= /span>

+Upstream-Status: Pending

+

<= p class=3D"MsoNormal" style=3D"margin: 0cm 0cm 0.0001pt; ">+Th= is patch updates libtool.m4 (and its output) to resolve a problem=

+with variable 'lt_sysroot' not being properly updated if the optio= n

+'--with[-libtool]-sysroot' is not provided when runnin= g 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.becke= rus 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   &nbs= p;       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_s= ysroot=3D

+ case ${with_libtool_sysroot} in #(=

+- yes)

++ no)

+  &= nbsp; if test "$GCC" =3D yes; then

+   &nb= sp;  lt_sysroot=3D`$CC --print-sysroot 2>/dev/null`

+    fi

+@@ -1242,7 +1242,7 @@<= /span>

+  /*)

+    lt_sysroot=3D`echo= "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`

<= p class=3D"MsoNormal" style=3D"margin: 0cm 0cm 0.0001pt; ">+&n= bsp;   ;; #(

+- no|'')

++ yes= |'')

+    ;; #(

+ = *)

+    AC_MSG_RESULT([${with_libtool_sys= root}])

--

1.8.3.3

= --Apple-Mail-D6895395-3F18-4ED2-A1B4-6F876DFA564A--