make perl's heredoc matching more generic to get rid of bogus reqs; rel 6

[packages/rpm.git] / x32.patch

diff --git a/x32.patch b/x32.patch
index cdaae33396b2bc7cc510c06dbf1700836c3bd717..9eab78d44a1c49e7460041e9cf456067426db8b0 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -52,16 +52,16 @@ diff -ur rpm-4.16.1.2/configure.ac rpm-4.16.1.2.x32/configure.ac
 --- rpm-4.16.1.2/configure.ac  2021-03-21 21:51:28.221530479 +0100
 +++ rpm-4.16.1.2.x32/configure.ac      2021-03-21 21:50:04.127398387 +0100
 @@ -930,6 +930,10 @@
-       host_os=`echo "${host_os}" | sed 's/-gnueabi$//'`
-       host_os_gnu=-gnueabi
+ if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
+       host_os=`echo "${host_os}" | sed 's/-gnu$//'`
  fi
 +if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then
 +      host_os=`echo "${host_os}" | sed 's/-gnux32$//'`
 +      host_os_gnu=-gnux32
 +fi
- if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
-       host_os=`echo "${host_os}" | sed 's/-gnu$//'`
- fi
+ 
+ changequote(<, >)
+ host_os_exact="${host_os}"
 diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
 --- rpm-4.16.1.2/installplatform       2020-05-28 12:04:25.027136631 +0200
 +++ rpm-4.16.1.2.x32/installplatform   2021-03-21 21:51:47.671145954 +0100