commit: 1cecb8196b77350c0d37bb75287dfa2f9fe47d47 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Apr 30 12:22:18 2024 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Apr 30 12:22:18 2024 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1cecb819
patches/e2fsprogs: update for 1.47.0 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> .../e2fsprogs-1.42.13-fix-build-cflags.patch | 13 ++++ .../1.47.0/e2fsprogs-1.44.6-parallel_install.patch | 10 +++ .../e2fsprogs/1.47.0/e2fsprogs-1.46.0-build.patch | 84 ++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/patches/e2fsprogs/1.47.0/e2fsprogs-1.42.13-fix-build-cflags.patch b/patches/e2fsprogs/1.47.0/e2fsprogs-1.42.13-fix-build-cflags.patch new file mode 100644 index 0000000..dcab9a3 --- /dev/null +++ b/patches/e2fsprogs/1.47.0/e2fsprogs-1.42.13-fix-build-cflags.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/516854 + +--- e2fsprogs-1.42.13/configure ++++ e2fsprogs-1.42.13/configure +@@ -1315,6 +1315,8 @@ + if test $cross_compiling = no; then + BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H" + BUILD_LDFLAGS="$LDFLAGS" ++else ++ BUILD_CFLAGS="$INCLUDES" + fi + + diff --git a/patches/e2fsprogs/1.47.0/e2fsprogs-1.44.6-parallel_install.patch b/patches/e2fsprogs/1.47.0/e2fsprogs-1.44.6-parallel_install.patch new file mode 100644 index 0000000..5762915 --- /dev/null +++ b/patches/e2fsprogs/1.47.0/e2fsprogs-1.44.6-parallel_install.patch @@ -0,0 +1,10 @@ +--- e2fsprogs-1.44.6/Makefile.in ++++ e2fsprogs-1.44.6/Makefile.in +@@ -72,6 +72,7 @@ + uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs + + install-libs: install-libs-recursive ++install-libs-recursive:: | install-shlibs-libs-recursive + + uninstall-libs: uninstall-libs-recursive + diff --git a/patches/e2fsprogs/1.47.0/e2fsprogs-1.46.0-build.patch b/patches/e2fsprogs/1.47.0/e2fsprogs-1.46.0-build.patch new file mode 100644 index 0000000..df908b6 --- /dev/null +++ b/patches/e2fsprogs/1.47.0/e2fsprogs-1.46.0-build.patch @@ -0,0 +1,84 @@ +--- a/MCONFIG.in ++++ b/MCONFIG.in +@@ -88,6 +88,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_l + + CC = @PTHREAD_CC@ + BUILD_CC = @BUILD_CC@ ++BUILD_CFLAGS = @BUILD_CFLAGS@ + PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ + PTHREAD_LIBS = @PTHREAD_LIBS@ + CFLAGS = @CFLAGS@ +--- a/configure ++++ b/configure +@@ -10399,14 +10399,12 @@ $as_echo "$as_me: WARNING: + esac + fi + +- +-# See if we need a separate native compiler. +-if test $cross_compiling = no; then +- BUILD_CC="$CC" +- +-else +- for ac_prog in gcc cc +-do ++if test "${BUILD_CC+set}" != "set"; then ++ if test $cross_compiling = no; then ++ BUILD_CC="$CC" ++ else ++ for ac_prog in gcc cc ++ do + # 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 +@@ -10447,6 +10445,16 @@ fi + test -n "$BUILD_CC" && break + done + ++ fi ++fi ++ ++if test "${BUILD_CFLAGS+set}" != "set"; then ++ if test $cross_compiling = no; then ++ BUILD_CFLAGS="$CFLAGS" ++ else ++ BUILD_CFLAGS="-g -O2" ++ 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/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h + do : +--- a/configure.ac ++++ b/configure.ac +@@ -960,13 +960,24 @@ else + fi + AC_SUBST(MAKEINFO) + AC_PROG_INSTALL +-# See if we need a separate native compiler. +-if test $cross_compiling = no; then +- BUILD_CC="$CC" +- AC_SUBST(BUILD_CC) +-else +- AC_CHECK_PROGS(BUILD_CC, gcc cc) ++ ++AC_ARG_VAR(BUILD_CC, [C compiler for build tools]) ++if test "${BUILD_CC+set}" != "set"; then ++ if test $cross_compiling = no; then ++ BUILD_CC="$CC" ++ else ++ AC_CHECK_PROGS(BUILD_CC, gcc cc) ++ fi ++fi ++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools]) ++if test "${BUILD_CFLAGS+set}" != "set"; then ++ if test $cross_compiling = no; then ++ BUILD_CFLAGS="$CFLAGS" ++ else ++ BUILD_CFLAGS="-g -O2" ++ fi + fi ++ + AC_CHECK_HEADERS(m4_flatten([ + dirent.h + errno.h +
