From: Barry Naujok <bnaujok@sgi.com>
Date: Fri, 7 Sep 2007 06:12:37 +0000 (+0000)
Subject: Link xfsprogs utils to libpthread when linking to libxfs
X-Git-Tag: v2.10.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5f7dceb1338e32987e2503aab1e6b4da8c4812;p=thirdparty%2Fxfsprogs-dev.git

Link xfsprogs utils to libpthread when linking to libxfs
Merge of master-melb:xfs-cmds:29621a by kenmcd.

  Bump version number to 2.9.4
---

diff --git a/VERSION b/VERSION
index a33b18f06..dcedddcbe 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=9
-PKG_REVISION=3
+PKG_REVISION=4
 PKG_BUILD=1
diff --git a/db/Makefile b/db/Makefile
index 11d65bcdc..edef85e12 100644
--- a/db/Makefile
+++ b/db/Makefile
@@ -16,7 +16,7 @@ HFILES = addr.h agf.h agfl.h agi.h attr.h attrshort.h bit.h block.h bmap.h \
 	attrset.h
 CFILES = $(HFILES:.h=.c)
 LSRCFILES = xfs_admin.sh xfs_check.sh xfs_ncheck.sh xfs_metadump.sh
-LLDLIBS	= $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT)
+LLDLIBS	= $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
 LLDFLAGS += -static
 
diff --git a/doc/CHANGES b/doc/CHANGES
index b73f1e4ff..8d818556c 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,10 @@
-xfsprogs-2.9.4 (15 AUG 2007)
+xfsprogs-2.9.4 (7 Sep 2007)
+	- Fixed xfs_repair segfaulting with directory block size different
+	  to the filesystem blocksize.
 	- Fixed xfs_quota disable, enable, off and remove commands.
-	  Thanks to Utako Kusaka <utako@tnes.nec.co.jp> for this. 
+	  Thanks to Utako Kusaka <utako@tnes.nec.co.jp> for this.
+	- Improved the robustness of xfs_metadump.
+	- Fix link issues with pthread library.
 
 xfsprogs-2.9.3 (23 July 2007)
 	- Make xfs_repair support > 512 byte sector sizes.
diff --git a/growfs/Makefile b/growfs/Makefile
index d853a37ee..82f38d822 100644
--- a/growfs/Makefile
+++ b/growfs/Makefile
@@ -9,7 +9,7 @@ LTCOMMAND = xfs_growfs
 
 CFILES = xfs_growfs.c
 
-LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID) $(LIBRT)
+LLDLIBS = $(LIBXFS) $(LIBXCMD) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXFS) $(LIBXCMD)
 LLDFLAGS = -static
 LSRCFILES = xfs_info.sh
diff --git a/logprint/Makefile b/logprint/Makefile
index 97ded1967..1388370a0 100644
--- a/logprint/Makefile
+++ b/logprint/Makefile
@@ -12,7 +12,7 @@ CFILES = logprint.c \
 	 log_copy.c log_dump.c log_misc.c \
 	 log_print_all.c log_print_trans.c
 
-LLDLIBS	= $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT)
+LLDLIBS	= $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
 LLDFLAGS = -static
 
diff --git a/mdrestore/Makefile b/mdrestore/Makefile
index b4bea1d9e..9f192090a 100644
--- a/mdrestore/Makefile
+++ b/mdrestore/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/include/builddefs
 LTCOMMAND = xfs_mdrestore
 CFILES = xfs_mdrestore.c
 
-LLDLIBS = $(LIBXFS) $(LIBRT)
+LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXFS)
 LLDFLAGS = -static
 
diff --git a/mkfs/Makefile b/mkfs/Makefile
index 58894a759..b98551750 100644
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -9,9 +9,9 @@ LTCOMMAND = mkfs.xfs
 FSTYP = fstyp
 
 HFILES = xfs_mkfs.h
-CFILES = maxtrres.c proto.c xfs_mkfs.c 
+CFILES = maxtrres.c proto.c xfs_mkfs.c
 
-LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK) $(LIBRT)
+LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBDISK) $(LIBRT) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXFS) $(LIBDISK)
 LLDFLAGS = -static
 
diff --git a/repair/Makefile b/repair/Makefile
index 955f25cd8..a5a6d71bb 100644
--- a/repair/Makefile
+++ b/repair/Makefile
@@ -18,7 +18,7 @@ CFILES = agheader.c attr_repair.c avl.c avl64.c bmap.c dino_chunks.c \
 	progress.c prefetch.c radix-tree.c rt.c sb.c scan.c threads.c \
 	versions.c xfs_repair.c
 
-LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBPTHREAD) $(LIBRT)
+LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
 LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
 LLDFLAGS = -static