[Buildroot] [PATCH] btrfs-progs: fix static build with gettext

[Buildroot] [PATCH] btrfs-progs: fix static build with gettext

[Baruch Siach]

gettext needs -pthread. Incidentally this change was also made in the package
Makefile itself for a different reason.

Also, drop -lm to match upstream change.

Fixes:
http://autobuild.buildroot.net/results/a53/a53f31355e955c734010922b47084605e13708ef/
http://autobuild.buildroot.net/results/43d/43deeeda31d9750b37e1f1058c3313a387843bee/

and more.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/btrfs-progs/btrfs-progs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk
index c6c36cf1556c..768660d27c8f 100644
--- a/package/btrfs-progs/btrfs-progs.mk
+++ b/package/btrfs-progs/btrfs-progs.mk
@@ -18,7 +18,7 @@ BTRFS_PROGS_MAKE_TARGET = static
 BTRFS_PROGS_MAKE_INSTALL_TARGET = install-static
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 # Add -lintl for libuuid
-BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lm -lz -llzo2 -L. -lintl"
+BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lz -llzo2 -L. -lintl -pthread"
 endif
 else
 BTRFS_PROGS_MAKE_TARGET = all
-- 
2.1.4

[Buildroot] [PATCH] btrfs-progs: fix static build with gettext

[Thomas Petazzoni]

Dear Baruch Siach,

On Tue, 17 Feb 2015 14:20:44 +0200, Baruch Siach wrote:
> gettext needs -pthread. Incidentally this change was also made in the package
> Makefile itself for a different reason.
> 
> Also, drop -lm to match upstream change.
> 
> Fixes:
> http://autobuild.buildroot.net/results/a53/a53f31355e955c734010922b47084605e13708ef/
> http://autobuild.buildroot.net/results/43d/43deeeda31d9750b37e1f1058c3313a387843bee/
> 
> and more.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/btrfs-progs/btrfs-progs.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks!

> -BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lm -lz -llzo2 -L. -lintl"
> +BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lz -llzo2 -L. -lintl -pthread"

This is really ugly, because we have to duplicate the lib_LIBS value
from the package Makefile, and whenever it gets changed in the package
Makefile, we need to remember to also change it here. Not great :-/

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

[Buildroot] [PATCH] btrfs-progs: fix static build with gettext

[Baruch Siach]

Hi Thomas,

On Thu, Feb 19, 2015 at 10:58:18PM +0100, Thomas Petazzoni wrote:
> On Tue, 17 Feb 2015 14:20:44 +0200, Baruch Siach wrote:
> > gettext needs -pthread. Incidentally this change was also made in the package
> > Makefile itself for a different reason.
> > 
> > Also, drop -lm to match upstream change.
> > 
> > Fixes:
> > http://autobuild.buildroot.net/results/a53/a53f31355e955c734010922b47084605e13708ef/
> > http://autobuild.buildroot.net/results/43d/43deeeda31d9750b37e1f1058c3313a387843bee/
> > 
> > and more.
> > 
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  package/btrfs-progs/btrfs-progs.mk | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Applied, thanks!
> 
> > -BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lm -lz -llzo2 -L. -lintl"
> > +BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lz -llzo2 -L. -lintl -pthread"
> 
> This is really ugly, because we have to duplicate the lib_LIBS value
> from the package Makefile, and whenever it gets changed in the package
> Makefile, we need to remember to also change it here. Not great :-/

This is temporary. Upstream switched to autotools for the next version (now at 
v3.19-rc2). Once we upgrade the usual LIBS= trick would be enough, I believe.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH] btrfs-progs: fix static build with gettext

[Thomas Petazzoni]

Dear Baruch Siach,

On Fri, 20 Feb 2015 00:04:00 +0200, Baruch Siach wrote:

> > This is really ugly, because we have to duplicate the lib_LIBS value
> > from the package Makefile, and whenever it gets changed in the package
> > Makefile, we need to remember to also change it here. Not great :-/
> 
> This is temporary. Upstream switched to autotools for the next version (now at 
> v3.19-rc2). Once we upgrade the usual LIBS= trick would be enough, I believe.

Ah, ok, good to know! Thanks.

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