* [Buildroot] [PATCH] pkg-autotools: fix patching libtool for version 2.4
@ 2015-01-26 23:30 Yann E. MORIN
2015-02-01 21:25 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Yann E. MORIN @ 2015-01-26 23:30 UTC (permalink / raw)
To: buildroot
If the libtool used by the package is 2.4 (i.e. with no patchlevel), we
end up with a confusing message:
/bin/sh: line 0: test: -gt: unary operator expected
That's because patchlevel is empty, and thus there is nothing to comapre
to 2, and test complains.
Fake a patchlevel of 0 (which is really what a missing patchlevel means
anyway) in that case.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
---
package/pkg-autotools.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index b20e20e..b6b83f8 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -69,7 +69,7 @@ define LIBTOOL_PATCH_HOOK
elif test $${ltmain_version} = "2.2"; then\
$(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
elif test $${ltmain_version} = "2.4"; then\
- if test $${ltmain_patchlevel} -gt 2; then\
+ if test $${ltmain_patchlevel:-0} -gt 2; then\
$(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.4.patch; \
else \
$(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] pkg-autotools: fix patching libtool for version 2.4
2015-01-26 23:30 [Buildroot] [PATCH] pkg-autotools: fix patching libtool for version 2.4 Yann E. MORIN
@ 2015-02-01 21:25 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2015-02-01 21:25 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Tue, 27 Jan 2015 00:30:24 +0100, Yann E. MORIN wrote:
> If the libtool used by the package is 2.4 (i.e. with no patchlevel), we
> end up with a confusing message:
>
> /bin/sh: line 0: test: -gt: unary operator expected
>
> That's because patchlevel is empty, and thus there is nothing to comapre
> to 2, and test complains.
>
> Fake a patchlevel of 0 (which is really what a missing patchlevel means
> anyway) in that case.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Peter Korsgaard <jacmet@uclibc.org>
> ---
> package/pkg-autotools.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-01 21:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-26 23:30 [Buildroot] [PATCH] pkg-autotools: fix patching libtool for version 2.4 Yann E. MORIN
2015-02-01 21:25 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.