From c229e8909096540910db9d52689308279a1fd1d0 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Thu, 12 Dec 2019 10:22:30 +0100
Subject: Fix: programs linking against libsquashfs also need pthread

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 difftool/Makemodule.am     | 2 ++
 lib/sqfs/libsquashfs.pc.in | 3 +--
 mkfs/Makemodule.am         | 3 ++-
 tar/Makemodule.am          | 5 ++++-
 unpack/Makemodule.am       | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/difftool/Makemodule.am b/difftool/Makemodule.am
index 7488ff1..ba597b3 100644
--- a/difftool/Makemodule.am
+++ b/difftool/Makemodule.am
@@ -2,6 +2,8 @@ sqfsdiff_SOURCES = difftool/sqfsdiff.c difftool/sqfsdiff.h difftool/util.c
 sqfsdiff_SOURCES += difftool/compare_dir.c difftool/node_compare.c
 sqfsdiff_SOURCES += difftool/compare_files.c difftool/super.c
 sqfsdiff_SOURCES += difftool/extract.c difftool/options.c
+sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 sqfsdiff_LDADD = libcommon.a libsquashfs.la libcompat.a $(LZO_LIBS) libfstree.a
+sqfsdiff_LDADD += $(PTHREAD_LIBS)
 
 bin_PROGRAMS += sqfsdiff
diff --git a/lib/sqfs/libsquashfs.pc.in b/lib/sqfs/libsquashfs.pc.in
index 0244bad..77d9ad7 100644
--- a/lib/sqfs/libsquashfs.pc.in
+++ b/lib/sqfs/libsquashfs.pc.in
@@ -8,7 +8,6 @@ Version: @PACKAGE_VERSION@
 Description: A library for working with SquashFS file systems.
 
 Cflags: -I${includedir}
-Libs: -L${libdir} -lsquashfs
+Libs: -L${libdir} -lsquashfs @PTHREAD_LIBS@
 
 Requires.private: @LIBSQFS_DEP_MOD@
-Libs.private: @PTHREAD_LIBS@
diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am
index ce42c5e..34f3d76 100644
--- a/mkfs/Makemodule.am
+++ b/mkfs/Makemodule.am
@@ -2,8 +2,9 @@ gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/options.c
 gensquashfs_SOURCES += mkfs/dirscan.c mkfs/selinux.c
 gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a
 gensquashfs_LDADD += libcompat.a $(LIBSELINUX_LIBS) $(LZO_LIBS)
+gensquashfs_LDADD += $(PTHREAD_LIBS)
 gensquashfs_CPPFLAGS = $(AM_CPPFLAGS)
-gensquashfs_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS)
+gensquashfs_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS) $(PTHREAD_CFLAGS)
 
 if WITH_SELINUX
 gensquashfs_CPPFLAGS += -DWITH_SELINUX
diff --git a/tar/Makemodule.am b/tar/Makemodule.am
index 26ac95c..9d56ebb 100644
--- a/tar/Makemodule.am
+++ b/tar/Makemodule.am
@@ -1,9 +1,12 @@
 sqfs2tar_SOURCES = tar/sqfs2tar.c
+sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 sqfs2tar_LDADD = libcommon.a libsquashfs.la libtar.a libcompat.a
-sqfs2tar_LDADD += libfstree.a $(LZO_LIBS)
+sqfs2tar_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS)
 
 tar2sqfs_SOURCES = tar/tar2sqfs.c
+tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a
 tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS)
+tar2sqfs_LDADD += $(PTHREAD_LIBS)
 
 bin_PROGRAMS += sqfs2tar tar2sqfs
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index 3d3a2d6..94aa0b2 100644
--- a/unpack/Makemodule.am
+++ b/unpack/Makemodule.am
@@ -2,7 +2,8 @@ rdsquashfs_SOURCES = unpack/rdsquashfs.c unpack/rdsquashfs.h
 rdsquashfs_SOURCES += unpack/list_files.c unpack/options.c
 rdsquashfs_SOURCES += unpack/restore_fstree.c unpack/describe.c
 rdsquashfs_SOURCES += unpack/fill_files.c unpack/dump_xattrs.c
+rdsquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 rdsquashfs_LDADD = libcommon.a libcompat.a libsquashfs.la
-rdsquashfs_LDADD += libfstree.a $(LZO_LIBS)
+rdsquashfs_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS)
 
 bin_PROGRAMS += rdsquashfs
-- 
cgit v1.2.3