diff --git a/httpd-2.4.51-sw.patch b/httpd-2.4.51-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..c4c73d534ec87001c817cd20c297dfe06e7d5b02 --- /dev/null +++ b/httpd-2.4.51-sw.patch @@ -0,0 +1,29 @@ +diff -Nuar httpd-2.4.51.org/build/config.guess httpd-2.4.51.sw/build/config.guess +--- httpd-2.4.51.org/build/config.guess 2022-02-27 01:53:32.070000000 +0000 ++++ httpd-2.4.51.sw/build/config.guess 2022-02-27 02:16:38.810000000 +0000 +@@ -917,6 +917,14 @@ + UNAME_MACHINE=aarch64_be + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi ++ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff -Nuar httpd-2.4.51.org/build/config.sub httpd-2.4.51.sw/build/config.sub +--- httpd-2.4.51.org/build/config.sub 2022-02-27 01:53:32.070000000 +0000 ++++ httpd-2.4.51.sw/build/config.sub 2022-02-27 02:18:55.610000000 +0000 +@@ -1157,6 +1157,7 @@ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ ++ | sw_64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ diff --git a/httpd.spec b/httpd.spec index f6083180be03c1da264017f2cffda159015fe64b..33b4bc88851d97fb6a2ca0b033f754ff653c09af 100644 --- a/httpd.spec +++ b/httpd.spec @@ -8,7 +8,7 @@ Name: httpd Summary: Apache HTTP Server Version: 2.4.51 -Release: 11 +Release: 12 License: ASL 2.0 URL: https://httpd.apache.org/ Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -94,6 +94,7 @@ Patch40: backport-fix-lua-request-with-cast-first.patch Patch41: backport-Handle-children-killed-pathologically.patch Patch42: backport-Merge-r1589986-r1589995-r1633528-from-trunk.patch Patch43: backport-mod_md-do-not-interfere-with-requests-to-well-known-acme-challenge.patch +Patch44: httpd-2.4.51-sw.patch BuildRequires: gcc autoconf pkgconfig findutils xmlto perl-interpreter perl-generators systemd-devel BuildRequires: zlib-devel libselinux-devel lua-devel brotli-devel @@ -526,6 +527,12 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Thu Dec 15 2022 zhangzhixin - 2.4.51-12 +- Type:intensifier +- ID:NA +- SUG:NA +- DESC:Add sw arch patch + * Mon Dec 12 2022 chengyehcun - 2.4.51-11 - Type:bugfix - ID:NA