pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove wip/e2fsprogs.
Module Name: pkgsrc-wip
Committed By: Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By: bsiegert
Date: Sun Jun 24 13:08:46 2018 +0200
Changeset: 18e06cba33d8ac19b8530b8eba0b0eaed7005cbe
Removed Files:
e2fsprogs/DESCR
e2fsprogs/Makefile
e2fsprogs/PLIST
e2fsprogs/TODO
e2fsprogs/distinfo
e2fsprogs/patches/patch-ab
e2fsprogs/patches/patch-ac
e2fsprogs/patches/patch-af
e2fsprogs/patches/patch-an
e2fsprogs/patches/patch-ao
e2fsprogs/patches/patch-as
e2fsprogs/patches/patch-aw
e2fsprogs/patches/patch-e2fsck_jfs__user.h
e2fsprogs/patches/patch-lib_ext2fs_bitops.c
e2fsprogs/patches/patch-lib_ext2fs_bitops.h
e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
e2fsprogs/patches/patch-lib_ext2fs_tdb.c
Log Message:
Remove wip/e2fsprogs.
It is quite a bit older than the one in sysutils.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=18e06cba33d8ac19b8530b8eba0b0eaed7005cbe
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
e2fsprogs/DESCR | 2 -
e2fsprogs/Makefile | 48 -----------------
e2fsprogs/PLIST | 80 -----------------------------
e2fsprogs/TODO | 9 ----
e2fsprogs/distinfo | 17 ------
e2fsprogs/patches/patch-ab | 28 ----------
e2fsprogs/patches/patch-ac | 44 ----------------
e2fsprogs/patches/patch-af | 21 --------
e2fsprogs/patches/patch-an | 17 ------
e2fsprogs/patches/patch-ao | 19 -------
e2fsprogs/patches/patch-as | 15 ------
e2fsprogs/patches/patch-aw | 15 ------
e2fsprogs/patches/patch-e2fsck_jfs__user.h | 15 ------
e2fsprogs/patches/patch-lib_ext2fs_bitops.c | 19 -------
e2fsprogs/patches/patch-lib_ext2fs_bitops.h | 15 ------
e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h | 15 ------
e2fsprogs/patches/patch-lib_ext2fs_tdb.c | 25 ---------
17 files changed, 404 deletions(-)
diffs:
diff --git a/e2fsprogs/DESCR b/e2fsprogs/DESCR
deleted file mode 100644
index f76c309676..0000000000
--- a/e2fsprogs/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs,
-dumpe2fs, fsck, and others.
diff --git a/e2fsprogs/Makefile b/e2fsprogs/Makefile
deleted file mode 100644
index e0519ff8c1..0000000000
--- a/e2fsprogs/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2014/12/10 12:54:22 makoto Exp $
-
-DISTNAME= e2fsprogs-1.42.12
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://e2fsprogs.sourceforge.net/
-COMMENT= Second extended file system (ext2fs) management programs
-LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND modified-bsd AND mit
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= makeinfo gmake
-INFO_FILES= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-# Only build fsck(8) on platforms that need it.
-PLIST_VARS+= fsck
-.if ${OPSYS} == "Linux"
-PLIST.fsck= yes
-.else
-CONFIGURE_ARGS+= --disable-fsck
-.endif
-
-EGDIR= ${PREFIX}/share/examples/ext2fs
-CONF_FILES+= ${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} root_sysconfdir=${EGDIR}
-
-SUBST_CLASSES+= man
-SUBST_MESSAGE.man= Give correct path for man page
-SUBST_STAGE.man= post-patch
-
-SUBST_FILES.man+= misc/mke2fs.8.in
-SUBST_FILES.man+= misc/mke2fs.conf.5.in
-SUBST_FILES.man+= e2fsck/e2fsck.conf.5.in
-SUBST_FILES.man+= lib/blkid/libblkid.3.in
-SUBST_FILES.man+= misc/blkid.8.in
-
-SUBST_SED.man+= -e '/mke2fs.conf/s,/etc,@root_sysconfdir@,'
-SUBST_SED.man+= -e '/mke2fs.conf/s,/etc,@root_sysconfdir@,'
-# next (two) path's in the man page do not exist
-SUBST_SED.man+= -e '/e2fsck.conf/s,/etc,@root_sysconfdir@,'
-SUBST_SED.man+= -e '/blkid.tab/s,/etc,@root_sysconfdir@,'
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/e2fsprogs/PLIST b/e2fsprogs/PLIST
deleted file mode 100644
index 6d21c79c04..0000000000
--- a/e2fsprogs/PLIST
+++ /dev/null
@@ -1,80 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/12/10 12:54:22 makoto Exp $
-bin/chattr
-bin/lsattr
-bin/uuidgen
-info/libext2fs.info
-lib/e2initrd_helper
-man/man1/chattr.1
-man/man1/lsattr.1
-man/man1/uuidgen.1
-man/man5/e2fsck.conf.5
-man/man5/ext2.5
-man/man5/ext3.5
-man/man5/ext4.5
-man/man5/mke2fs.conf.5
-man/man8/badblocks.8
-man/man8/blkid.8
-man/man8/debugfs.8
-man/man8/dumpe2fs.8
-man/man8/e2freefrag.8
-man/man8/e2fsck.8
-man/man8/e2image.8
-man/man8/e2label.8
-man/man8/e2undo.8
-man/man8/filefrag.8
-man/man8/findfs.8
-man/man8/fsck.ext2.8
-man/man8/fsck.ext3.8
-man/man8/fsck.ext4.8
-man/man8/fsck.ext4dev.8
-man/man8/logsave.8
-man/man8/mke2fs.8
-man/man8/mkfs.ext2.8
-man/man8/mkfs.ext3.8
-man/man8/mkfs.ext4.8
-man/man8/mkfs.ext4dev.8
-man/man8/mklost+found.8
-man/man8/resize2fs.8
-man/man8/tune2fs.8
-man/man8/uuidd.8
-sbin/badblocks
-sbin/blkid
-sbin/debugfs
-sbin/dumpe2fs
-sbin/e2freefrag
-sbin/e2fsck
-sbin/e2image
-sbin/e2label
-sbin/e2undo
-sbin/filefrag
-sbin/findfs
-sbin/fsck.ext2
-sbin/fsck.ext3
-sbin/fsck.ext4
-sbin/fsck.ext4dev
-sbin/logsave
-sbin/mke2fs
-sbin/mkfs.ext2
-sbin/mkfs.ext3
-sbin/mkfs.ext4
-sbin/mkfs.ext4dev
-sbin/mklost+found
-sbin/resize2fs
-sbin/tune2fs
-sbin/uuidd
-share/examples/ext2fs/mke2fs.conf
-share/locale/ca/LC_MESSAGES/e2fsprogs.mo
-share/locale/cs/LC_MESSAGES/e2fsprogs.mo
-share/locale/de/LC_MESSAGES/e2fsprogs.mo
-share/locale/eo/LC_MESSAGES/e2fsprogs.mo
-share/locale/es/LC_MESSAGES/e2fsprogs.mo
-share/locale/fr/LC_MESSAGES/e2fsprogs.mo
-share/locale/id/LC_MESSAGES/e2fsprogs.mo
-share/locale/it/LC_MESSAGES/e2fsprogs.mo
-share/locale/nl/LC_MESSAGES/e2fsprogs.mo
-share/locale/pl/LC_MESSAGES/e2fsprogs.mo
-share/locale/sv/LC_MESSAGES/e2fsprogs.mo
-share/locale/tr/LC_MESSAGES/e2fsprogs.mo
-share/locale/uk/LC_MESSAGES/e2fsprogs.mo
-share/locale/vi/LC_MESSAGES/e2fsprogs.mo
-share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
diff --git a/e2fsprogs/TODO b/e2fsprogs/TODO
deleted file mode 100644
index 435b2791ee..0000000000
--- a/e2fsprogs/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-- Following patch containing __NetBSD__
- patches/patch-lib_ext2fs_bitops.c
- It doesn't seem to be correct.
-
-- In the man page of blkid and
- the path don't exist, would user create that file ?
-
- e2fsck.conf(5) /usr/pkg/etc/e2fsck.conf
- blkid(8) /usr/pkg/etc/blkid.tab
diff --git a/e2fsprogs/distinfo b/e2fsprogs/distinfo
deleted file mode 100644
index 38f0e81764..0000000000
--- a/e2fsprogs/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.9 2014/12/10 12:54:22 makoto Exp $
-
-SHA1 (e2fsprogs-1.42.12.tar.gz) = 083c1bb0d1e85672e8038a2fadf70b24e7409db7
-RMD160 (e2fsprogs-1.42.12.tar.gz) = 9ef9f3ed2381a0064312b57d808897eee6d04dc7
-Size (e2fsprogs-1.42.12.tar.gz) = 6381695 bytes
-SHA1 (patch-ab) = 9b686655a75239279a456dc8889113be06519cd7
-SHA1 (patch-ac) = ee5037c0e23aa5782e31e284367ea54552032457
-SHA1 (patch-af) = bcda43bb14afdbf6a98dfedd949af4d1aff443d6
-SHA1 (patch-an) = 8ac7043d2b27211b3af66d735c71f72d4a69359a
-SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6
-SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335
-SHA1 (patch-aw) = 544634d6603762dabaeffe950440f533c6495b32
-SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800
-SHA1 (patch-lib_ext2fs_bitops.c) = 0f6ceebae9e0fb01a64de75d654c82a88ab0db6c
-SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
-SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
-SHA1 (patch-lib_ext2fs_tdb.c) = 40aa772092ce78ef932c31f42352ad1fb84a2797
diff --git a/e2fsprogs/patches/patch-ab b/e2fsprogs/patches/patch-ab
deleted file mode 100644
index cf155999c6..0000000000
--- a/e2fsprogs/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2014/12/10 12:54:22 makoto Exp $
-
-DragonFly support
-
---- lib/ext2fs/getsize.c.orig 2014-08-03 05:26:22.000000000 +0900
-+++ lib/ext2fs/getsize.c 2014-12-10 20:45:18.000000000 +0900
-@@ -33,6 +33,9 @@
- #ifdef HAVE_SYS_DISKLABEL_H
- #include <sys/disklabel.h>
- #endif
-+#ifdef __DragonFly__
-+#include <sys/disklabel32.h>
-+#endif
- #ifdef HAVE_SYS_DISK_H
- #include <sys/disk.h>
- #endif
-@@ -198,7 +201,11 @@ errcode_t ext2fs_get_device_size2(const
- #ifdef HAVE_SYS_DISKLABEL_H
- {
- int part;
-+#ifdef __DragonFly__
-+ struct disklabel32 lab;
-+#else
- struct disklabel lab;
-+#endif
- struct partition *pp;
- char ch;
-
diff --git a/e2fsprogs/patches/patch-ac b/e2fsprogs/patches/patch-ac
deleted file mode 100644
index b19ad4d240..0000000000
--- a/e2fsprogs/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2014/12/10 12:54:22 makoto Exp $
-
-DragonFly support
-
---- lib/blkid/getsize.c.orig 2014-08-03 05:26:22.000000000 +0900
-+++ lib/blkid/getsize.c 2014-12-10 20:50:28.000000000 +0900
-@@ -32,6 +32,9 @@
- #ifdef HAVE_SYS_DISKLABEL_H
- #include <sys/disklabel.h>
- #endif
-+#ifdef __DragonFly__
-+#include <sys/disklabel32.h>
-+#endif
- #ifdef HAVE_SYS_DISK_H
- #include <sys/disk.h>
- #endif
-@@ -130,8 +133,14 @@ blkid_loff_t blkid_get_dev_size(int fd)
- #ifdef HAVE_SYS_DISKLABEL_H
- {
- int part = -1;
-+
-+#ifdef __DragonFly__
-+ struct disklabel32 lab;
-+ struct partition32 *pp;
-+#else
- struct disklabel lab;
- struct partition *pp;
-+#endif
- char ch;
- struct stat st;
-
-@@ -147,8 +156,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
- if (fstat(fd, &st) >= 0 &&
- (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
- part = st.st_rdev & 7;
--
-+#ifdef __DragonFly__
-+ if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
-+#else
- if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
-+#endif
- pp = &lab.d_partitions[part];
- if (pp->p_size)
- return pp->p_size << 9;
diff --git a/e2fsprogs/patches/patch-af b/e2fsprogs/patches/patch-af
deleted file mode 100644
index 1bf053d85e..0000000000
--- a/e2fsprogs/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.3 2014/12/10 12:54:22 makoto Exp $
-
-Add a patch to use struct statvfs on NetBSD 2.0F and newer. Fixes PR 25891
-by Andreas Wiese.
-Upate __NetBSD_Version__ statvfs check from 200060000 to 299000900
-
---- lib/ext2fs/ismounted.c.orig 2010-05-18 03:04:39.000000000 +0000
-+++ lib/ext2fs/ismounted.c
-@@ -198,7 +198,11 @@ static errcode_t check_mntent(const char
- static errcode_t check_getmntinfo(const char *file, int *mount_flags,
- char *mtpt, int mtlen)
- {
-- struct statfs *mp;
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
-+ struct statvfs *mp;
-+#else
-+ struct statfs *mp;
-+#endif
- int len, n;
- const char *s1;
- char *s2;
diff --git a/e2fsprogs/patches/patch-an b/e2fsprogs/patches/patch-an
deleted file mode 100644
index d3b86cdfe8..0000000000
--- a/e2fsprogs/patches/patch-an
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-an,v 1.3 2014/12/10 12:54:22 makoto Exp $
-
-Where to find the config file
-
---- e2fsck/e2fsck.h.orig 2014-08-03 05:26:22.000000000 +0900
-+++ e2fsck/e2fsck.h 2014-12-10 20:54:53.000000000 +0900
-@@ -69,6 +69,10 @@
-
- #include "quota/quotaio.h"
-
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc" /* Where to find the config file */
-+#endif
-+
- /*
- * Exit codes used by fsck-type programs
- */
diff --git a/e2fsprogs/patches/patch-ao b/e2fsprogs/patches/patch-ao
deleted file mode 100644
index 18205806cf..0000000000
--- a/e2fsprogs/patches/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2014/12/10 12:54:22 makoto Exp $
-
-Where to find the config file
-
---- lib/blkid/blkidP.h.orig 2009-08-13 01:39:57.000000000 +0000
-+++ lib/blkid/blkidP.h
-@@ -104,7 +104,11 @@ struct blkid_struct_cache
- extern char *blkid_strdup(const char *s);
- extern char *blkid_strndup(const char *s, const int length);
-
--#define BLKID_CACHE_FILE "/etc/blkid.tab"
-+#ifndef ETC_DIR
-+#define ETC_DIR "/etc" /* Where to find the config file */
-+#endif
-+
-+#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab"
-
- #define BLKID_ERR_IO 5
- #define BLKID_ERR_PROC 9
diff --git a/e2fsprogs/patches/patch-as b/e2fsprogs/patches/patch-as
deleted file mode 100644
index 8728e2d87d..0000000000
--- a/e2fsprogs/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1 2014/12/10 12:54:22 makoto Exp $
-
-Give correct path for short help
-
---- misc/blkid.c.orig 2009-08-13 01:39:57.000000000 +0000
-+++ misc/blkid.c
-@@ -52,7 +52,7 @@ static void usage(int error)
- fprintf(out,
- "usage:\t%s [-c <file>] [-ghlLv] [-o format] "
- "[-s <tag>] [-t <token>]\n [-w <file>] [dev ...]\n"
-- "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
-+ "\t-c\tcache file (default: " ROOT_SYSCONFDIR "/blkid.tab, /dev/null = none)\n"
- "\t-h\tprint this usage message and exit\n"
- "\t-g\tgarbage collect the blkid cache\n"
- "\t-s\tshow specified tag(s) (default show all tags)\n"
diff --git a/e2fsprogs/patches/patch-aw b/e2fsprogs/patches/patch-aw
deleted file mode 100644
index 78ecfeb910..0000000000
--- a/e2fsprogs/patches/patch-aw
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2014/12/10 12:54:22 makoto Exp $
-
-Don't gzip info file
-
---- doc/Makefile.in.orig 2010-02-10 23:16:03.000000000 +0000
-+++ doc/Makefile.in
-@@ -26,8 +26,6 @@ install-doc-libs: libext2fs.info libext2
- echo " INSTALL_DATA $(infodir)/$$i" ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
- done
-- $(E) " GZIP $(infodir)/libext2fs.info*"
-- -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
-
- uninstall-doc-libs:
- $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
diff --git a/e2fsprogs/patches/patch-e2fsck_jfs__user.h b/e2fsprogs/patches/patch-e2fsck_jfs__user.h
deleted file mode 100644
index 958947cfcb..0000000000
--- a/e2fsprogs/patches/patch-e2fsck_jfs__user.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-e2fsck_jfs__user.h,v 1.1 2014/12/10 12:54:22 makoto Exp $
-
-Force GNU inline semantic.
-
---- e2fsck/jfs_user.h.orig 2014-07-06 13:13:18.000000000 +0900
-+++ e2fsck/jfs_user.h 2014-12-10 21:09:03.000000000 +0900
-@@ -93,7 +93,7 @@ extern size_t journal_tag_bytes(journal_
- #define _INLINE_ inline
- #else /* not C99 */
- #ifdef __GNUC__
--#define _INLINE_ extern __inline__
-+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
- #else /* For Watcom C */
- #define _INLINE_ extern inline
- #endif /* __GNUC__ */
diff --git a/e2fsprogs/patches/patch-lib_ext2fs_bitops.c b/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
deleted file mode 100644
index 05b850ad9d..0000000000
--- a/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-lib_ext2fs_bitops.c,v 1.1 2014/12/10 12:54:23 makoto Exp $
-
-/usr/include/strings.h:60:14: note: previous declaration of 'popcount32' was here
- unsigned int popcount32(__uint32_t) __constfunc;
-
---- lib/ext2fs/bitops.c~ 2014-07-03 23:33:48.000000000 +0900
-+++ lib/ext2fs/bitops.c 2014-12-10 21:13:14.000000000 +0900
-@@ -123,7 +123,11 @@ static unsigned int popcount8(unsigned i
- return (res + (res >> 4)) & 0x0F;
- }
-
-+#ifdef __NetBSD__
-+ unsigned int popcount32(__uint32_t w)
-+#else
- static unsigned int popcount32(unsigned int w)
-+#endif
- {
- unsigned int res = w - ((w >> 1) & 0x55555555);
- res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
diff --git a/e2fsprogs/patches/patch-lib_ext2fs_bitops.h b/e2fsprogs/patches/patch-lib_ext2fs_bitops.h
deleted file mode 100644
index e507aa35df..0000000000
--- a/e2fsprogs/patches/patch-lib_ext2fs_bitops.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_ext2fs_bitops.h,v 1.1 2014/12/10 12:54:23 makoto Exp $
-
-Force GNU inline semantic.
-
---- lib/ext2fs/bitops.h.orig 2014-07-03 23:33:48.000000000 +0900
-+++ lib/ext2fs/bitops.h 2014-12-10 21:10:47.000000000 +0900
-@@ -238,7 +238,7 @@ extern errcode_t ext2fs_find_first_set_g
- #define _INLINE_ inline
- #else /* not C99 */
- #ifdef __GNUC__
--#define _INLINE_ extern __inline__
-+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
- #else /* For Watcom C */
- #define _INLINE_ extern inline
- #endif /* __GNUC__ */
diff --git a/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h b/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
deleted file mode 100644
index b8c40ff5ca..0000000000
--- a/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_ext2fs_ext2fs.h,v 1.1 2014/12/10 12:54:23 makoto Exp $
-
-Force GNU inline semantic.
-
---- lib/ext2fs/ext2fs.h.orig 2014-08-03 05:26:22.000000000 +0900
-+++ lib/ext2fs/ext2fs.h 2014-12-10 21:03:40.000000000 +0900
-@@ -1529,7 +1529,7 @@ extern __u64 ext2fs_div64_ceil(__u64 a,
- #define _INLINE_ inline
- #else
- #ifdef __GNUC__
--#define _INLINE_ extern __inline__
-+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
- #else /* For Watcom C */
- #define _INLINE_ extern inline
- #endif /* __GNUC__ */
diff --git a/e2fsprogs/patches/patch-lib_ext2fs_tdb.c b/e2fsprogs/patches/patch-lib_ext2fs_tdb.c
deleted file mode 100644
index 2a960735fd..0000000000
--- a/e2fsprogs/patches/patch-lib_ext2fs_tdb.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-lib_ext2fs_tdb.c,v 1.1 2014/12/10 12:54:23 makoto Exp $
-
-Move #include <sys/types.h> before the #define of _XOPEN_SOURCE so that
-u_short etc. are being defined by it.
-
-Fixes build on MirBSD.
-
---- lib/ext2fs/tdb.c.orig 2014-06-26 04:19:40.000000000 +0900
-+++ lib/ext2fs/tdb.c 2014-12-10 21:05:31.000000000 +0900
-@@ -36,6 +36,7 @@ Last Changed Date: 2007-06-22 13:36:10 -
- #define HAVE_UTIME_H
- #define HAVE_UTIME
- #endif
-+#include <sys/types.h>
- #define _XOPEN_SOURCE 600
-
- #include "config.h"
-@@ -50,7 +51,6 @@ Last Changed Date: 2007-06-22 13:36:10 -
- #include <sys/select.h>
- #endif
- #include <sys/time.h>
--#include <sys/types.h>
- #include <time.h>
- #ifdef HAVE_UTIME_H
- #include <utime.h>
Home |
Main Index |
Thread Index |
Old Index