| 1 |
commit: 84d3ae3d8a0cbb655b3dc2f0dac9fda0fb52f748 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 8 21:16:52 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 8 21:41:50 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=84d3ae3d |
| 7 |
|
| 8 |
Bump e2fsprogs to v1.46.0 |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
.../e2fsprogs-1.42.13-fix-build-cflags.patch | 0 |
| 13 |
.../e2fsprogs-1.44.6-parallel_install.patch | 0 |
| 14 |
.../e2fsprogs-1.46.0-build.patch} | 16 ++++---- |
| 15 |
.../1.46.0/e2fsprogs-1.46.0-pthreads_build.patch | 46 ++++++++++++++++++++++ |
| 16 |
4 files changed, 54 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/patches/e2fsprogs/1.45.6/e2fsprogs-1.42.13-fix-build-cflags.patch b/patches/e2fsprogs/1.46.0/e2fsprogs-1.42.13-fix-build-cflags.patch |
| 19 |
similarity index 100% |
| 20 |
rename from patches/e2fsprogs/1.45.6/e2fsprogs-1.42.13-fix-build-cflags.patch |
| 21 |
rename to patches/e2fsprogs/1.46.0/e2fsprogs-1.42.13-fix-build-cflags.patch |
| 22 |
|
| 23 |
diff --git a/patches/e2fsprogs/1.45.6/e2fsprogs-1.44.6-parallel_install.patch b/patches/e2fsprogs/1.46.0/e2fsprogs-1.44.6-parallel_install.patch |
| 24 |
similarity index 100% |
| 25 |
rename from patches/e2fsprogs/1.45.6/e2fsprogs-1.44.6-parallel_install.patch |
| 26 |
rename to patches/e2fsprogs/1.46.0/e2fsprogs-1.44.6-parallel_install.patch |
| 27 |
|
| 28 |
diff --git a/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch b/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-build.patch |
| 29 |
similarity index 85% |
| 30 |
rename from patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch |
| 31 |
rename to patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-build.patch |
| 32 |
index 63e37f5..37b0510 100644 |
| 33 |
--- a/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch |
| 34 |
+++ b/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-build.patch |
| 35 |
@@ -1,16 +1,16 @@ |
| 36 |
--- a/MCONFIG.in |
| 37 |
+++ b/MCONFIG.in |
| 38 |
-@@ -86,6 +86,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l |
| 39 |
+@@ -88,6 +88,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l |
| 40 |
|
| 41 |
- CC = @CC@ |
| 42 |
+ CC = @PTHREAD_CC@ |
| 43 |
BUILD_CC = @BUILD_CC@ |
| 44 |
+BUILD_CFLAGS = @BUILD_CFLAGS@ |
| 45 |
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ |
| 46 |
+ PTHREAD_LIBS = @PTHREAD_LIBS@ |
| 47 |
CFLAGS = @CFLAGS@ |
| 48 |
- CFLAGS_SHLIB = @CFLAGS_SHLIB@ |
| 49 |
- CFLAGS_STLIB = @CFLAGS_STLIB@ |
| 50 |
--- a/configure |
| 51 |
+++ b/configure |
| 52 |
-@@ -12398,14 +12398,12 @@ $as_echo "$as_me: WARNING: |
| 53 |
+@@ -10399,14 +10399,12 @@ $as_echo "$as_me: WARNING: |
| 54 |
esac |
| 55 |
fi |
| 56 |
|
| 57 |
@@ -31,7 +31,7 @@ |
| 58 |
# Extract the first word of "$ac_prog", so it can be a program name with args. |
| 59 |
set dummy $ac_prog; ac_word=$2 |
| 60 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
| 61 |
-@@ -12446,6 +12444,16 @@ fi |
| 62 |
+@@ -10447,6 +10445,16 @@ fi |
| 63 |
test -n "$BUILD_CC" && break |
| 64 |
done |
| 65 |
|
| 66 |
@@ -46,11 +46,11 @@ |
| 67 |
+ fi |
| 68 |
+ |
| 69 |
fi |
| 70 |
- for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysctl.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
| 71 |
+ for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
| 72 |
do : |
| 73 |
--- a/configure.ac |
| 74 |
+++ b/configure.ac |
| 75 |
-@@ -910,13 +910,24 @@ else |
| 76 |
+@@ -960,13 +960,24 @@ else |
| 77 |
fi |
| 78 |
AC_SUBST(MAKEINFO) |
| 79 |
AC_PROG_INSTALL |
| 80 |
|
| 81 |
diff --git a/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-pthreads_build.patch b/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-pthreads_build.patch |
| 82 |
new file mode 100644 |
| 83 |
index 0000000..9d251d2 |
| 84 |
--- /dev/null |
| 85 |
+++ b/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-pthreads_build.patch |
| 86 |
@@ -0,0 +1,46 @@ |
| 87 |
+From 24487a7fa64bfa92bea21be3ca8c155e5de7438f Mon Sep 17 00:00:00 2001 |
| 88 |
+From: Theodore Ts'o <tytso@×××.edu> |
| 89 |
+Date: Fri, 29 Jan 2021 22:28:31 -0500 |
| 90 |
+Subject: configure.ac: fix build failure on systems with pthreads && !fuse |
| 91 |
+ support |
| 92 |
+ |
| 93 |
+The configure script checks for pthread.h as part of double-checking |
| 94 |
+that the FUSE support works correctly, which implicitly defined |
| 95 |
+HAVE_PHREAD_H. If the FUSE libraries are not present (or fuse support |
| 96 |
+is explicitly disabled), this check doesn't happen and so |
| 97 |
+HAVE_PTHREAD_H is not defined, and this causes a build failure. |
| 98 |
+ |
| 99 |
+Signed-off-by: Theodore Ts'o <tytso@×××.edu> |
| 100 |
+--- |
| 101 |
+ configure | 2 +- |
| 102 |
+ configure.ac | 1 + |
| 103 |
+ 2 files changed, 2 insertions(+), 1 deletion(-) |
| 104 |
+ |
| 105 |
+diff --git a/configure b/configure |
| 106 |
+index 9d41d069..6b8b7f4b 100755 |
| 107 |
+--- a/configure |
| 108 |
++++ b/configure |
| 109 |
+@@ -10448,7 +10448,7 @@ fi |
| 110 |
+ done |
| 111 |
+ |
| 112 |
+ fi |
| 113 |
+-for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
| 114 |
++for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h pthread.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
| 115 |
+ do : |
| 116 |
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 117 |
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
| 118 |
+diff --git a/configure.ac b/configure.ac |
| 119 |
+index 141c4d9c..42b6f486 100644 |
| 120 |
+--- a/configure.ac |
| 121 |
++++ b/configure.ac |
| 122 |
+@@ -975,6 +975,7 @@ AC_CHECK_HEADERS(m4_flatten([ |
| 123 |
+ malloc.h |
| 124 |
+ mntent.h |
| 125 |
+ paths.h |
| 126 |
++ pthread.h |
| 127 |
+ semaphore.h |
| 128 |
+ setjmp.h |
| 129 |
+ signal.h |
| 130 |
+-- |
| 131 |
+cgit 1.2.3-1.el7 |
| 132 |
+ |
Archives