+2003-03-14 Theodore Ts'o <tytso@mit.edu>
+
+ * configure.in: Add support for Apple/Darwin shared libraries.
+
2003-03-06 Theodore Tso <tytso@thunk.org>
* Makefile.in (.exclude-subset): Include the doc directory in the
BSDLIB_CMT=
MAKEFILE_BSDLIB=$srcdir/lib/Makefile.bsd-lib
LIB_EXT=.so
+ [case "$host_os" in
+ darwin.*)
+ MAKEFILE_BSDLIB=$srcdir/lib/Makefile.darwin-lib
+ LIB_EXT=.dylib
+ ;;
+ esac]
echo "Enabling BSD shared libraries"
fi
,
2003-03-14 Theodore Ts'o <tytso@mit.edu>
+ * iscan.c, scantest.c, unix.c: And #ifdef protection around
+ #include of malloc.h
+
* rehash.c (duplicate_search_and_fix): Now search for duplicates
filenames, and either prompt to remove a complete
duplicate entry, or to rename a duplicate filename.
#include <mntent.h>
#endif
#include <sys/ioctl.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include "et/com_err.h"
#include "e2fsck.h"
#include <mntent.h>
#endif
#include <sys/ioctl.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include <sys/resource.h>
#include "et/com_err.h"
#include <mntent.h>
#endif
#include <sys/ioctl.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include "et/com_err.h"
#include "e2fsck.h"
+2003-03-14 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.darwin-lib: New file to provide support for e2fsprogs
+ on Apple Darwin.
+
2002-11-09 Theodore Ts'o <tytso@mit.edu>
* Release of E2fsprogs 1.32
--- /dev/null
+#
+# This is a Makefile stub which handles the creation of Darwin BSD shared
+# libraries.
+#
+# In order to use this stub, the following makefile variables must be
+efined.
+#
+# BSDLIB_VERSION = 1.0
+# BSDLIB_IMAGE = libce
+# BSDLIB_MYDIR = et
+# BSDLIB_INSTALL_DIR = $(SHLIBDIR)
+#
+
+all:: pic image
+
+subdirs:: pic
+
+pic:
+ mkdir pic
+
+BSD_LIB = $(BSDLIB_IMAGE).$(BSDLIB_VERSION).dylib
+
+image: $(BSD_LIB)
+
+$(BSD_LIB): $(OBJS)
+ (cd pic; $(CC) -dynamiclib -compatibility_version 1.0
+ -current_version $(BSDLIB_VERSION) \
+ -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS))
+ $(MV) pic/$(BSD_LIB) .
+ $(RM) -f ../$(BSD_LIB)
+ $(LN) $(BSD_LIB) ../$(BSD_LIB)
+ $(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib
+
+install-shlibs install:: $(BSD_LIB)
+ $(INSTALL_PROGRAM) $(BSD_LIB) \
+ $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
+ -$(LDCONFIG)
+
+uninstall-shlibs uninstall::
+ $(RM) -f $(DESTDIR)$(BSDLIB_INSTALL_DIR)/$(BSD_LIB)
+
+clean::
+ $(RM) -rf pic
+ $(RM) -f $(BSD_LIB)
+ $(RM) -f ../$(BSD_LIB)
+ $(RM) -f ../$(BSDLIB_IMAGE).dylib
2003-03-14 Theodore Ts'o <tytso@mit.edu>
+ * getsize.c: Add support for Apple Darwin's ioctl to get the hard
+ disk size.
+
* badblocks.c (ext2fs_u32_list_count), ext2fs.h: Add new function
which returns the number of entries in the list.
#define BLKGETSIZE _IO(0x12,96) /* return device size */
#endif
+#ifdef APPLE_DARWIN
+#include <sys/ioctl.h>
+#include <sys/disk.h>
+
+#define BLKGETSIZE DKIOCGETBLOCKCOUNT32
+#endif /* APPLE_DARWIN */
+
#include "ext2_fs.h"
#include "ext2fs.h"
+2003-03-14 Theodore Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Add support for Apple Darwin
+
2003-03-06 Theodore Tso <tytso@mit.edu>
* uuid_types.h.in: Don't redefine types if other e2fsprogs
#
../../lib/libuuid.a: libuuid.a
../../lib/libuuid.so: image
+../../lib/libuuid.dylib: image
# +++ Dependency line eater +++
#
+2003-03-14 Theodore Ts'o <tytso@mit.edu>
+
+ * fsck.c: And #ifdef protection around #include of malloc.h
+
2003-03-13 Theodore Ts'o <tytso@mit.edu>
* e2image.c (write_raw_image_file): Include blocks from slow
#if HAVE_ERRNO_H
#include <errno.h>
#endif
+#if HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include "../version.h"
#include "nls-enable.h"