[gentoo-commits] proj/genkernel:master commit in: patches/e2fsprogs/1.46.0/, patches/e2fsprogs/1.45.6/

[gentoo-commits] proj/genkernel:master commit in: patches/e2fsprogs/1.46.0/, patches/e2fsprogs/1.45.6/

[Thomas Deutschmann]

commit:     84d3ae3d8a0cbb655b3dc2f0dac9fda0fb52f748
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 21:16:52 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 21:41:50 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=84d3ae3d

Bump e2fsprogs to v1.46.0

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../e2fsprogs-1.42.13-fix-build-cflags.patch       |  0
 .../e2fsprogs-1.44.6-parallel_install.patch        |  0
 .../e2fsprogs-1.46.0-build.patch}                  | 16 ++++----
 .../1.46.0/e2fsprogs-1.46.0-pthreads_build.patch   | 46 ++++++++++++++++++++++
 4 files changed, 54 insertions(+), 8 deletions(-)

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
similarity index 100%
rename from patches/e2fsprogs/1.45.6/e2fsprogs-1.42.13-fix-build-cflags.patch
rename to patches/e2fsprogs/1.46.0/e2fsprogs-1.42.13-fix-build-cflags.patch

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
similarity index 100%
rename from patches/e2fsprogs/1.45.6/e2fsprogs-1.44.6-parallel_install.patch
rename to patches/e2fsprogs/1.46.0/e2fsprogs-1.44.6-parallel_install.patch

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
similarity index 85%
rename from patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch
rename to patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-build.patch
index 63e37f5..37b0510 100644
--- a/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch
+++ b/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-build.patch
@@ -1,16 +1,16 @@
 --- a/MCONFIG.in
 +++ b/MCONFIG.in
-@@ -86,6 +86,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l
+@@ -88,6 +88,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l
  
- CC = @CC@
+ CC = @PTHREAD_CC@
  BUILD_CC = @BUILD_CC@
 +BUILD_CFLAGS = @BUILD_CFLAGS@
+ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
  CFLAGS = @CFLAGS@
- CFLAGS_SHLIB = @CFLAGS_SHLIB@
- CFLAGS_STLIB = @CFLAGS_STLIB@
 --- a/configure
 +++ b/configure
-@@ -12398,14 +12398,12 @@ $as_echo "$as_me: WARNING:
+@@ -10399,14 +10399,12 @@ $as_echo "$as_me: WARNING:
      esac
  fi
  
@@ -31,7 +31,7 @@
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -12446,6 +12444,16 @@ fi
+@@ -10447,6 +10445,16 @@ fi
    test -n "$BUILD_CC" && break
  done
  
@@ -46,11 +46,11 @@
 +    fi
 +
  fi
- 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
+ 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
  do :
 --- a/configure.ac
 +++ b/configure.ac
-@@ -910,13 +910,24 @@ else
+@@ -960,13 +960,24 @@ else
  fi
  AC_SUBST(MAKEINFO)
  AC_PROG_INSTALL

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
new file mode 100644
index 0000000..9d251d2
--- /dev/null
+++ b/patches/e2fsprogs/1.46.0/e2fsprogs-1.46.0-pthreads_build.patch
@@ -0,0 +1,46 @@
+From 24487a7fa64bfa92bea21be3ca8c155e5de7438f Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Fri, 29 Jan 2021 22:28:31 -0500
+Subject: configure.ac: fix build failure on systems with pthreads && !fuse
+ support
+
+The configure script checks for pthread.h as part of double-checking
+that the FUSE support works correctly, which implicitly defined
+HAVE_PHREAD_H.  If the FUSE libraries are not present (or fuse support
+is explicitly disabled), this check doesn't happen and so
+HAVE_PTHREAD_H is not defined, and this causes a build failure.
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ configure    | 2 +-
+ configure.ac | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 9d41d069..6b8b7f4b 100755
+--- a/configure
++++ b/configure
+@@ -10448,7 +10448,7 @@ fi
+ done
+ 
+ fi
+-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
++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
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+diff --git a/configure.ac b/configure.ac
+index 141c4d9c..42b6f486 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -975,6 +975,7 @@ AC_CHECK_HEADERS(m4_flatten([
+ 	malloc.h
+ 	mntent.h
+ 	paths.h
++	pthread.h
+ 	semaphore.h
+ 	setjmp.h
+ 	signal.h
+-- 
+cgit 1.2.3-1.el7
+