From 2dd53eb4de91c25817af85475cfa9ff66e79c97b Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 19 Aug 2014 18:24:23 -0700 Subject: porting: various fixes regression tests OSX/FreeBSD - `wc -l` on OSX/FreeBSD adds spurious spaces, this clobbers up TAP output parsers - fix it. - `umount -l` doesn't exist on OSX/FreeBSD use 'umount -f' if available. - Add check for 'file' version, to handle mime type variations across versions - Converge 'glusterfs --attribute-timeout=0 --entry-timeout=0' into '$GFS' - Modify remaining 'mount -t nfs' to use 'mount_nfs' - Update sha1sum for OSX to use 'openssl sha1'. Change-Id: Id1012faa5d67a921513d220e7fa9cebafe830d34 BUG: 1131713 Signed-off-by: Harshavardhana Reviewed-on: http://review.gluster.org/8501 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- xlators/features/compress/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/features/compress') diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am index e69dc6bf236..4a4c8b1a8dd 100644 --- a/xlators/features/compress/src/Makefile.am +++ b/xlators/features/compress/src/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS = cdc.h cdc-mem-types.h cdc_la_LDFLAGS = -module -avoid-version cdc_la_SOURCES = cdc.c cdc-helper.c -cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) +cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(ZLIB_LIBS) AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \ -shared $(LIBZ_CFLAGS) -- cgit