From 42dd254f5937274f164a5a7c5fb3c1f80e38e7af Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 27 Jul 2012 10:45:02 +0200 Subject: full build on Darwin fixes --- package/e2fsprogs/Makefile | 8 ++++---- package/e2fsprogs/patches/patch-debugfs_dump_c | 10 +++++----- package/e2fsprogs/patches/patch-debugfs_logdump_c | 6 +++--- package/e2fsprogs/patches/patch-debugfs_set_fields_c | 6 +++--- package/e2fsprogs/patches/patch-misc_Makefile_in | 16 ++++++++-------- package/e2fsprogs/patches/patch-misc_e2initrd_helper_c | 6 +++--- package/e2fsprogs/patches/patch-misc_e2undo_c | 6 +++--- package/e2fsprogs/patches/patch-util_symlinks_c | 10 ++++++++++ 8 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 package/e2fsprogs/patches/patch-util_symlinks_c (limited to 'package/e2fsprogs') diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index f198e74f5..0d855ac99 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.41.14 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 +PKG_VERSION:= 1.42.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b6e296f210d642361b7394437ff0f318 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs PKG_DEPENDS:= libcom-err libuuid libblkid libpthread @@ -58,7 +58,7 @@ $(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_M $(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK})) CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath \ - --disable-libuuid + --disable-libuuid --disable-libblkid INSTALL_TARGET+= install-libs TARGET_LDFLAGS+= -lpthread TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c b/package/e2fsprogs/patches/patch-debugfs_dump_c index ad28d3c02..7e2868281 100644 --- a/package/e2fsprogs/patches/patch-debugfs_dump_c +++ b/package/e2fsprogs/patches/patch-debugfs_dump_c @@ -1,6 +1,6 @@ ---- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 -+++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:30:02.000000000 +0100 -@@ -19,7 +19,6 @@ +--- e2fsprogs-1.42.4.orig/debugfs/dump.c 2012-05-29 03:29:43.000000000 +0200 ++++ e2fsprogs-1.42.4/debugfs/dump.c 2012-07-26 18:48:09.000000000 +0200 +@@ -22,7 +22,6 @@ #include #include #include @@ -8,7 +8,7 @@ #ifdef HAVE_GETOPT_H #include #else -@@ -67,7 +66,6 @@ static mode_t mode_xlate(__u16 lmode) +@@ -70,7 +69,6 @@ static mode_t mode_xlate(__u16 lmode) static void fix_perms(const char *cmd, const struct ext2_inode *inode, int fd, const char *name) { @@ -16,7 +16,7 @@ int i; if (fd != -1) -@@ -90,11 +88,6 @@ static void fix_perms(const char *cmd, c +@@ -93,11 +91,6 @@ static void fix_perms(const char *cmd, c if (fd != -1) close(fd); diff --git a/package/e2fsprogs/patches/patch-debugfs_logdump_c b/package/e2fsprogs/patches/patch-debugfs_logdump_c index 07155d7b6..bc00efb0d 100644 --- a/package/e2fsprogs/patches/patch-debugfs_logdump_c +++ b/package/e2fsprogs/patches/patch-debugfs_logdump_c @@ -1,6 +1,6 @@ ---- e2fsprogs-1.41.14.orig/debugfs/logdump.c 2010-12-22 16:49:20.000000000 +0100 -+++ e2fsprogs-1.41.14/debugfs/logdump.c 2010-12-25 22:31:30.000000000 +0100 -@@ -21,7 +21,6 @@ +--- e2fsprogs-1.42.4.orig/debugfs/logdump.c 2012-06-04 18:42:23.000000000 +0200 ++++ e2fsprogs-1.42.4/debugfs/logdump.c 2012-07-26 18:48:09.000000000 +0200 +@@ -22,7 +22,6 @@ #include #include #include diff --git a/package/e2fsprogs/patches/patch-debugfs_set_fields_c b/package/e2fsprogs/patches/patch-debugfs_set_fields_c index 985eff51e..6168cd0c5 100644 --- a/package/e2fsprogs/patches/patch-debugfs_set_fields_c +++ b/package/e2fsprogs/patches/patch-debugfs_set_fields_c @@ -1,6 +1,6 @@ ---- e2fsprogs-1.41.14.orig/debugfs/set_fields.c 2010-12-22 16:49:20.000000000 +0100 -+++ e2fsprogs-1.41.14/debugfs/set_fields.c 2010-12-25 22:25:52.000000000 +0100 -@@ -33,7 +33,6 @@ +--- e2fsprogs-1.42.4.orig/debugfs/set_fields.c 2012-06-04 18:42:23.000000000 +0200 ++++ e2fsprogs-1.42.4/debugfs/set_fields.c 2012-07-26 18:48:09.000000000 +0200 +@@ -34,7 +34,6 @@ #include #endif #include diff --git a/package/e2fsprogs/patches/patch-misc_Makefile_in b/package/e2fsprogs/patches/patch-misc_Makefile_in index 504b975b9..46f2510c6 100644 --- a/package/e2fsprogs/patches/patch-misc_Makefile_in +++ b/package/e2fsprogs/patches/patch-misc_Makefile_in @@ -1,6 +1,6 @@ ---- e2fsprogs-1.41.14.orig/misc/Makefile.in 2010-12-22 16:49:20.000000000 +0100 -+++ e2fsprogs-1.41.14/misc/Makefile.in 2011-12-05 19:36:48.078609219 +0100 -@@ -14,9 +14,6 @@ INSTALL = @INSTALL@ +--- e2fsprogs-1.42.4.orig/misc/Makefile.in 2012-06-04 18:49:49.000000000 +0200 ++++ e2fsprogs-1.42.4/misc/Makefile.in 2012-07-26 18:48:09.000000000 +0200 +@@ -17,9 +17,6 @@ INSTALL = @INSTALL@ @IMAGER_CMT@E2IMAGE_PROG= e2image @IMAGER_CMT@E2IMAGE_MAN= e2image.8 @@ -10,8 +10,8 @@ @BLKID_CMT@BLKID_PROG= blkid @BLKID_CMT@BLKID_MAN= blkid.8 -@@ -31,8 +28,8 @@ SMANPAGES= tune2fs.8 mklost+found.8 mke2 - logsave.8 filefrag.8 e2freefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@ +@@ -35,8 +32,8 @@ SMANPAGES= tune2fs.8 mklost+found.8 mke2 + $(UUIDD_MAN) $(E4DEFRAG_MAN) @FSCK_MAN@ FMANPAGES= mke2fs.conf.5 -UPROGS= chattr lsattr @UUID_CMT@ uuidgen @@ -21,7 +21,7 @@ LPROGS= @E2INITRD_PROG@ -@@ -41,8 +38,6 @@ MKLPF_OBJS= mklost+found.o +@@ -45,8 +42,6 @@ MKLPF_OBJS= mklost+found.o MKE2FS_OBJS= mke2fs.o util.o profile.o prof_err.o default_profile.o CHATTR_OBJS= chattr.o LSATTR_OBJS= lsattr.o @@ -30,7 +30,7 @@ DUMPE2FS_OBJS= dumpe2fs.o BADBLOCKS_OBJS= badblocks.o E2IMAGE_OBJS= e2image.o -@@ -58,8 +53,6 @@ PROFILED_MKE2FS_OBJS= profiled/mke2fs.o +@@ -63,8 +58,6 @@ PROFILED_MKE2FS_OBJS= profiled/mke2fs.o profiled/prof_err.o profiled/default_profile.o PROFILED_CHATTR_OBJS= profiled/chattr.o PROFILED_LSATTR_OBJS= profiled/lsattr.o @@ -39,7 +39,7 @@ PROFILED_DUMPE2FS_OBJS= profiled/dumpe2fs.o PROFILED_BADBLOCKS_OBJS= profiled/badblocks.o PROFILED_E2IMAGE_OBJS= profiled/e2image.o -@@ -75,7 +68,7 @@ XTRA_CFLAGS= -I$(srcdir)/../e2fsck -I. +@@ -78,7 +71,7 @@ PROFILED_E4DEFRAG_OBJS= profiled/e4defra SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \ $(srcdir)/chattr.c $(srcdir)/lsattr.c $(srcdir)/dumpe2fs.c \ $(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \ diff --git a/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c b/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c index 152e4e0a2..736c1c948 100644 --- a/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c +++ b/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c @@ -1,6 +1,6 @@ ---- e2fsprogs-1.41.14.orig/misc/e2initrd_helper.c 2009-08-13 03:39:57.000000000 +0200 -+++ e2fsprogs-1.41.14/misc/e2initrd_helper.c 2010-12-25 22:33:06.000000000 +0100 -@@ -23,7 +23,6 @@ +--- e2fsprogs-1.42.4.orig/misc/e2initrd_helper.c 2012-03-18 19:18:33.000000000 +0100 ++++ e2fsprogs-1.42.4/misc/e2initrd_helper.c 2012-07-26 18:48:09.000000000 +0200 +@@ -24,7 +24,6 @@ #include #include #include diff --git a/package/e2fsprogs/patches/patch-misc_e2undo_c b/package/e2fsprogs/patches/patch-misc_e2undo_c index 2d1441220..bc9fdb619 100644 --- a/package/e2fsprogs/patches/patch-misc_e2undo_c +++ b/package/e2fsprogs/patches/patch-misc_e2undo_c @@ -1,7 +1,7 @@ optind seems to need unistd.h, not only getopt.h ---- e2fsprogs-1.41.12.orig/misc/e2undo.c 2010-05-14 00:59:49.000000000 +0200 -+++ e2fsprogs-1.41.12/misc/e2undo.c 2010-10-18 12:03:49.329511558 +0200 -@@ -19,6 +19,7 @@ +--- e2fsprogs-1.42.4.orig/misc/e2undo.c 2012-03-18 19:18:33.000000000 +0100 ++++ e2fsprogs-1.42.4/misc/e2undo.c 2012-07-26 18:48:09.000000000 +0200 +@@ -20,6 +20,7 @@ #if HAVE_ERRNO_H #include #endif diff --git a/package/e2fsprogs/patches/patch-util_symlinks_c b/package/e2fsprogs/patches/patch-util_symlinks_c new file mode 100644 index 000000000..a8011f907 --- /dev/null +++ b/package/e2fsprogs/patches/patch-util_symlinks_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.42.4.orig/util/symlinks.c 2012-05-15 04:04:19.000000000 +0200 ++++ e2fsprogs-1.42.4/util/symlinks.c 2012-07-26 18:50:03.000000000 +0200 +@@ -8,7 +8,6 @@ + #endif + #include + #include +-#include + #include + #include + #include -- cgit v1.2.3