diff --git a/e2fsprogs-1.46.4-sw.patch b/e2fsprogs-1.46.4-sw.patch new file mode 100755 index 0000000000000000000000000000000000000000..c3fb220258beb0c236808fa05b2671a35a2c3aa1 --- /dev/null +++ b/e2fsprogs-1.46.4-sw.patch @@ -0,0 +1,110 @@ +diff -Naur e2fsprogs-1.46.4.org/aclocal.m4 e2fsprogs-1.46.4.sw/aclocal.m4 +--- e2fsprogs-1.46.4.org/aclocal.m4 2022-02-11 01:16:05.650000000 +0000 ++++ e2fsprogs-1.46.4.sw/aclocal.m4 2022-02-11 01:49:05.840000000 +0000 +@@ -978,6 +978,12 @@ + ;; + + changequote(,)dnl ++ sw_64* ) ++changequote([,])dnl ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ ++changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha +@@ -1242,6 +1248,9 @@ + #ifndef __x86_64__ + #undef __x86_64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __alpha__ + #undef __alpha__ + #endif +@@ -1355,7 +1364,7 @@ + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; +- x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) ++ x86_64 | sw_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; +@@ -1385,7 +1394,7 @@ + + # CPUs that only support a 64-bit ABI. + changequote(,)dnl +- alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ ++ sw_64* | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + changequote([,])dnl + gl_cv_host_cpu_c_abi_32bit=no +diff -Naur e2fsprogs-1.46.4.org/configure e2fsprogs-1.46.4.sw/configure +--- e2fsprogs-1.46.4.org/configure 2022-02-11 01:16:05.650000000 +0000 ++++ e2fsprogs-1.46.4.sw/configure 2022-02-11 01:23:50.430000000 +0000 +@@ -4462,7 +4462,7 @@ + if test "$GCC" = yes + then + case "$host_cpu" in +- alpha) addcflags="-mieee" ;; ++ alpha | sw_64) addcflags="-mieee" ;; + esac + fi + if test "x$addcflags" != x +@@ -7552,7 +7552,7 @@ + case "$gl_cv_host_cpu_c_abi" in + i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) + gl_cv_host_cpu_c_abi_32bit=yes ;; +- x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) ++ x86_64 | alpha | sw_64 | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + gl_cv_host_cpu_c_abi_32bit=no ;; + *) + gl_cv_host_cpu_c_abi_32bit=unknown ;; +@@ -7581,7 +7581,7 @@ + ;; + + # CPUs that only support a 64-bit ABI. +- alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ ++ sw_64* | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \ + | mmix ) + gl_cv_host_cpu_c_abi_32bit=no + ;; +diff -Naur e2fsprogs-1.46.4.org/configure.ac e2fsprogs-1.46.4.sw/configure.ac +--- e2fsprogs-1.46.4.org/configure.ac 2022-02-11 01:16:05.650000000 +0000 ++++ e2fsprogs-1.46.4.sw/configure.ac 2022-02-11 01:46:43.790000000 +0000 +@@ -113,7 +113,7 @@ + if test "$GCC" = yes + then + case "$host_cpu" in +- alpha) addcflags="-mieee" ;; ++ alpha | sw_64) addcflags="-mieee" ;; + esac + fi + if test "x$addcflags" != x +diff -Naur e2fsprogs-1.46.4.org/lib/blkid/llseek.c e2fsprogs-1.46.4.sw/lib/blkid/llseek.c +--- e2fsprogs-1.46.4.org/lib/blkid/llseek.c 2022-02-11 01:16:05.700000000 +0000 ++++ e2fsprogs-1.46.4.sw/lib/blkid/llseek.c 2022-02-11 01:27:04.520000000 +0000 +@@ -88,7 +88,7 @@ + return (retval == -1 ? (blkid_loff_t) retval : result); + } + +-#endif /* __alpha__ || __ia64__ */ ++#endif /* __alpha__ || __sw_64__ || __ia64__ */ + + #endif /* HAVE_LLSEEK */ + +diff -Naur e2fsprogs-1.46.4.org/lib/ext2fs/unix_io.c e2fsprogs-1.46.4.sw/lib/ext2fs/unix_io.c +--- e2fsprogs-1.46.4.org/lib/ext2fs/unix_io.c 2022-02-11 01:16:05.740000000 +0000 ++++ e2fsprogs-1.46.4.sw/lib/ext2fs/unix_io.c 2022-02-11 01:31:24.900000000 +0000 +@@ -786,7 +786,7 @@ + + #ifdef __linux__ + #undef RLIM_INFINITY +-#if (defined(__alpha__) || ((defined(__sparc__) || defined(__mips__)) && (SIZEOF_LONG == 4))) ++#if (defined(__alpha__) || defined(__sw_64__) || ((defined(__sparc__) || defined(__mips__)) && (SIZEOF_LONG == 4))) + #define RLIM_INFINITY ((unsigned long)(~0UL>>1)) + #else + #define RLIM_INFINITY (~0UL) diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 7cc423d3ad4b3c2253a9fa3efe414ca4fdc5e3e2..cd3c4a1d0cc0c7e8e9a5b86e03eff155fb92f235 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -22,7 +22,7 @@ Patch12: 0012-tests-skip-m_rootdir_acl-if-selinux-is-not-disabled.patch Patch13: 0013-e2fsck-do-not-clean-up-file-acl-if-the-inode-is-trun.patch Patch14: 0014-e2fsck-handle-level-is-overflow-in-ext2fs_extent_get.patch Patch15: 0015-libext2fs-add-sanity-check-to-extent-manipulation.patch - +Patch16: e2fsprogs-1.46.4-sw.patch BuildRequires: gcc pkgconfig texinfo BuildRequires: fuse-devel libblkid-devel libuuid-devel @@ -163,6 +163,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Fri Jun 24 2022 wuzx - 1.46.4-12 +- add sw64 patch + * Tue Jun 21 2022 lihaoxiang - 1.46.4-11 - DESC:add wrapper header file for i686 and x86_64 then fix conflicts when intall i686 rpms.