From e6c5396e68de473a8a6033beabedb16a95c0d85e Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Wed, 1 Aug 2001 04:25:55 +0000 Subject: [PATCH] add an entry for these few minor items. --- doc/CHANGES | 6 ++++++ include/builddefs.in | 14 ++++++++------ libdisk/drivers.c | 1 + libdisk/md.c | 1 + mkfs/fstyp.c | 1 + rtcp/xfs_rtcp.c | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/CHANGES b/doc/CHANGES index 935203d14..59926309e 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,9 @@ +xfsprogs-current + - several man pages updated to document external log usage + - install yet another shared library symlink for ld to find + - switched on -fno-strict-aliasing for library object builds + - fix several minor compiler warnings when building on IA64 + xfsprogs-1.3.3 (27 July 2001) - fixes for (hopefully) the last few nits in libtool usage diff --git a/include/builddefs.in b/include/builddefs.in index ff58626ee..6e6f7d1f8 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -99,7 +99,8 @@ LDLIBS = $(LLDLIBS) $(MALLOCLIB) MAKEOPTS = --no-print-directory SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES) -DIRT = $(LDIRT) dep dep.bak $(OBJECTS) $(LTCOMMAND) $(LTLIBRARY) *.[1-9].gz +DIRT = $(LDIRT) dep dep.bak $(OBJECTS) $(LTOBJECTS) *.[1-9].gz \ + $(LTCOMMAND) $(LTLIBRARY) OBJECTS = $(ASFILES:.s=.o) \ $(CFILES:.c=.o) \ @@ -118,18 +119,19 @@ CXXF = $(CXX) $(CXXFLAGS) LDF = $(LD) $(LDFLAGS) # For libtool. -DIRT += $(LTOBJECTS) $(LTLIBRARY) +LIBNAME = $(basename $(LTLIBRARY)) +LTOBJECTS = $(OBJECTS:.o=.lo) +LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + LTLINK = $(LIBTOOL) --mode=link $(CC) LTEXEC = $(LIBTOOL) --mode=execute LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT -LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -LTOBJECTS = $(OBJECTS:.o=.lo) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT -fno-strict-aliasing + ifeq ($(ENABLE_SHARED),yes) LTLDFLAGS += -rpath $(PKG_SLIB_DIR) LTLDFLAGS += -version-info $(LTVERSION) endif -LIBNAME = $(basename $(LTLIBRARY)) ifeq ($(ENABLE_SHARED),yes) INSTALL_LTLIB = \ diff --git a/libdisk/drivers.c b/libdisk/drivers.c index 06f290c82..6e56c9c66 100644 --- a/libdisk/drivers.c +++ b/libdisk/drivers.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/libdisk/md.c b/libdisk/md.c index 12e596d61..ac93d596c 100644 --- a/libdisk/md.c +++ b/libdisk/md.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include "md.h" diff --git a/mkfs/fstyp.c b/mkfs/fstyp.c index 3a46b93eb..9e6eebc56 100644 --- a/mkfs/fstyp.c +++ b/mkfs/fstyp.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/rtcp/xfs_rtcp.c b/rtcp/xfs_rtcp.c index 2f76ed2aa..ebad94d5f 100644 --- a/rtcp/xfs_rtcp.c +++ b/rtcp/xfs_rtcp.c @@ -317,7 +317,7 @@ rtcp( char *source, char *target, int fextsize) source, dioattr.d_miniosz); if ( pflag ) { printf("%s will be padded to %lld bytes.\n", - tbuf, + tbuf, (long long) (((s1.st_size / dioattr.d_miniosz) + 1) * dioattr.d_miniosz) ); -- 2.47.2