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 a33b18f067f8353b6f153a78270d82b69114fe09..dcedddcbe74a870920b6d1675b5e6d9c9d3720bf 100644 (file)
--- 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 11d65bcdcab2847f31d9b71729dbf5da7a80ff01..edef85e129c6f85feea050aee8b0a46b23ce4a38 100644 (file)
--- 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 b73f1e4ff0dfa5967ef9a5b4fdff86ea175335d9..8d818556cba0d6ad14f579f886d20bf7df874f3a 100644 (file)
--- 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 d853a37eefd11bebe17efdc6037720e3384b5ffa..82f38d82244756867fdcd28215eb70436c291e3a 100644 (file)
--- 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 97ded19679af38689e8eb221ab381b6f1874308a..1388370a0371417d9d207cb544d001d56a904319 100644 (file)
--- 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 b4bea1d9e9919671e9f56c22631a3c33648a0edd..9f192090ad98bd0d6c6bcbc67bfe086fb149c730 100644 (file)
--- 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 58894a759ecb7e1a15e6c7175ade19155ee0daf9..b9855175044c7f9f577e7a9d065db43abf8130b0 100644 (file)
--- 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 955f25cd806747f58064a3adb09ed5c2fc70083d..a5a6d71bbe85570fb65a2cb8c2cc15f69a855392 100644 (file)
--- 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