Skip to contentSkip to conversation

package/autoconf-archive: fix ax_tls syntax error

PATCH New Romain Naour 3 participants 3 messages May 3, 2015 – May 5, 2015

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH v2 1/1 package/autoconf-archive: fix ax_tls syntax error

The ax_tls.m4 serial 11 procude a syntax error
in configure scripts.

Fixes:
http://autobuild.buildroot.net/results/619/619339810617212a667fe72278ec727ee992ffbf/

Signed-off-by Romain Naour <[email protected]>

---
v2: remove the [] on the third part of AS_IF (Yann E. MORIN)

 .../0001-AX_TLS-fix-syntax-error.patch             | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch
package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch new file +46 -0
new file mode 100644
index 0000000..6d345d3
@@ -0,0 +1,46 @@
+From 1870301013d79be781ead2b0e62fc08f91715ca9 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sun, 3 May 2015 23:02:34 +0200
+Subject: [PATCH] AX_TLS: fix syntax error
+
+The commit e012eb17b3d67f31dee477592328207437206c33 introduce
+a syntax error due to an empty "else" statement.
+
+confifure:
+if test "$ac_cv_tls" != "none"; then :
+cat >>confdefs.h <<_ACEOF
+_ACEOF
+else
+
+fi
+
+Remove the [] on the third part of AS_IF.
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ m4/ax_tls.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4
+index 809b761..2135dd2 100644
+--- a/m4/ax_tls.m4
++++ b/m4/ax_tls.m4
+@@ -44,7 +44,7 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 11
++#serial 12
+ 
+ AC_DEFUN([AX_TLS], [
+   AC_MSG_CHECKING([for thread local storage (TLS) class])
+@@ -70,5 +70,5 @@ AC_DEFUN([AX_TLS], [
+   AS_IF([test "$ac_cv_tls" != "none"],
+     [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here])
+      m4_ifnblank([$1],[$1])],
+-    [m4_ifnblank([$2],[$2])])
++    m4_ifnblank([$2],[$2]))
+ ])
+-- 
+1.9.3
+
Signature · 1 line
1.9.3
#1 lore raw

PATCH v2 1/1 package/autoconf-archive: fix ax_tls syntax error

Romain, All,

On 2015-05-04 00:04 +0200, Romain Naour spake thusly:

Quoted 20 lines

The ax_tls.m4 serial 11 procude a syntax error
in configure scripts.

Fixes:
http://autobuild.buildroot.net/results/619/619339810617212a667fe72278ec727ee992ffbf/

Signed-off-by Romain Naour <[email protected]>

---
v2: remove the [] on the third part of AS_IF (Yann E. MORIN)

 .../0001-AX_TLS-fix-syntax-error.patch             | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch
package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch new file +0 -0
new file mode 100644
index 0000000..6d345d3

package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch line 9

Quoted 9 lines
package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch new file +9 -0
@@ -0,0 +1,46 @@
+From 1870301013d79be781ead2b0e62fc08f91715ca9 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Sun, 3 May 2015 23:02:34 +0200
+Subject: [PATCH] AX_TLS: fix syntax error
+
+The commit e012eb17b3d67f31dee477592328207437206c33 introduce
+a syntax error due to an empty "else" statement.
+
+confifure:

"confifure"? Did you mean confiture? Or maybe configure? ;-)

Quoted 23 lines
package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch new file +23 -0
+if test "$ac_cv_tls" != "none"; then :
+cat >>confdefs.h <<_ACEOF
+_ACEOF
+else
+
+fi
+
+Remove the [] on the third part of AS_IF.
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ m4/ax_tls.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4
+index 809b761..2135dd2 100644
+--- a/m4/ax_tls.m4
++++ b/m4/ax_tls.m4
+@@ -44,7 +44,7 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 11

package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch line 42

Quoted 10 lines
package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch new file +10 -0
++#serial 12
+ 
+ AC_DEFUN([AX_TLS], [
+   AC_MSG_CHECKING([for thread local storage (TLS) class])
+@@ -70,5 +70,5 @@ AC_DEFUN([AX_TLS], [
+   AS_IF([test "$ac_cv_tls" != "none"],
+     [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here])
+      m4_ifnblank([$1],[$1])],
+-    [m4_ifnblank([$2],[$2])])
++    m4_ifnblank([$2],[$2]))

Those m4 quoting rules just always make me nervous... So I've had a look about everywhere in autoconf-archive, and the least we can say it's they're not uniform... :-( I could see that level of quotation in other parts of autoconf-archive, so Ok.

Anyway, this restores the code to the working states it was in before the bad changeset, and fixes the issue.

So, given the above;

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 11 lines
package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch new file +4 -0
+ ])
+-- 
+1.9.3
+
Signature · 6 lines
1.9.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH v2 1/1 package/autoconf-archive: fix ax_tls syntax error

In reply to Romain Naour

Dear Romain Naour,

Quoted 9 lines · Romain Naour

The ax_tls.m4 serial 11 procude a syntax error
in configure scripts.

Fixes:
http://autobuild.buildroot.net/results/619/619339810617212a667fe72278ec727ee992ffbf/

Signed-off-by Romain Naour <[email protected]>

---
v2: remove the [] on the third part of AS_IF (Yann E. MORIN)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com