btrfs-progs: fix static build with gettext
PATCH 1/1 btrfs-progs: fix static build with gettext
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.
--- package/btrfs-progs/btrfs-progs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/btrfs-progs/btrfs-progs.mk +1 -1
@@ -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
Signature · 1 line
2.1.4
Thomas Petazzoni
AppliedPATCH 1/1 btrfs-progs: fix static build with gettext
Dear Baruch Siach,
Quoted 9 lines · Baruch Siach
gettext needs -pthread. Incidentally this change was also made in the package
Makefileitself 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/
Quoted 6 lines
and more.
Signed-off-by Baruch Siach <[email protected]>--- package/btrfs-progs/btrfs-progs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks!
package/btrfs-progs/btrfs-progs.mk BTRFS_PROGS_MAKE_TARGET = static · line 21
Quoted 2 lines
package/btrfs-progs/btrfs-progs.mk +1
-1-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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 btrfs-progs: fix static build with gettext
Hi Thomas,
Quoted 17 lines · Thomas Petazzoni
Quoted 9 lines · Baruch Siach
gettext needs -pthread. Incidentally this change was also made in the package
Makefileitself 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/Quoted 6 lines
and more.
Signed-off-by Baruch Siach <[email protected]>--- package/btrfs-progs/btrfs-progs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 8 lines
Applied, thanks!
package/btrfs-progs/btrfs-progs.mk BTRFS_PROGS_MAKE_TARGET = static · line 21
Quoted 2 lines
package/btrfs-progs/btrfs-progs.mk +1
-1-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_LIBSvalue from the packageMakefile, and whenever it gets changed in the packageMakefile, 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
Signature · 3 lines
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 -PATCH 1/1 btrfs-progs: fix static build with gettext
Dear Baruch Siach,
Quoted 6 lines · Baruch Siach
Quoted 3 lines
This is really ugly, because we have to duplicate the
lib_LIBSvalue from the packageMakefile, and whenever it gets changed in the packageMakefile, 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com