From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 24 Jun 2021 19:33:39 +0000 (+0200)
Subject: Analysis workflow, fixup shell.
X-Git-Tag: release-1.13.2rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b468f708cf6363ec3327a92c7aab583c45f48298;p=thirdparty%2Funbound.git

Analysis workflow, fixup shell.
---

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 5ef512c0d..307187b16 100644
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -289,23 +289,22 @@ jobs:
           curl -L -k -s -S -o expat-2.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.gz
           tar xzf expat-2.2.10.tar.gz
           cd expat-2.2.10
-          echo "./configure SHELL=/usr/bin/bash.exe CONFIG_SHELL=/usr/bin/bash.exe --prefix=\"$prepath/expat\" --exec-prefix=\"$prepath/expat\" --bindir=\"$prepath/expat/bin\" --includedir=\"$prepath/expat/include\" --mandir=\"$prepath/expat/man\" --libdir=\"$prepath/expat/lib\""
+          echo "./configure SHELL=/usr/bin/bash CONFIG_SHELL=/usr/bin/bash --prefix=\"$prepath/expat\" --exec-prefix=\"$prepath/expat\" --bindir=\"$prepath/expat/bin\" --includedir=\"$prepath/expat/include\" --mandir=\"$prepath/expat/man\" --libdir=\"$prepath/expat/lib\""
           ./configure SHELL=/usr/bin/bash CONFIG_SHELL=/usr/bin/bash --prefix="$prepath/expat" --exec-prefix="$prepath/expat" --bindir="$prepath/expat/bin" --includedir="$prepath/expat/include" --mandir="$prepath/expat/man" --libdir="$prepath/expat/lib"
-          # fixup shell from space in pathname
+          # fixup SHELL is treated specially, but SHELZZ is not by make.
           grep 'SHELL =' Makefile | cat
-          #mv Makefile Makefile.orig
-          #sed -e 's?^SHELL =.*$??' < Makefile.orig > Makefile
-          #mv lib/Makefile lib/Makefile.orig
-          #sed -e 's?^SHELL =.*$??' < lib/Makefile.orig > lib/Makefile
-          #mv doc/Makefile doc/Makefile.orig
-          #sed -e 's?^SHELL =.*$??' < doc/Makefile.orig > doc/Makefile
-          #mv examples/Makefile examples/Makefile.orig
-          #sed -e 's?^SHELL =.*$??' < examples/Makefile.orig > examples/Makefile
-          #mv tests/Makefile tests/Makefile.orig
-          #sed -e 's?^SHELL =.*$??' < tests/Makefile.orig > tests/Makefile
-          #mv xmlwf/Makefile xmlwf/Makefile.orig
-          #sed -e 's?^SHELL =.*$??' < xmlwf/Makefile.orig > xmlwf/Makefile
-          #export MAKESHELL="/bin/sh"
+          mv Makefile Makefile.orig
+          sed -e 's/SHELL/SHELLZZ/g' < Makefile.orig > Makefile
+          mv lib/Makefile lib/Makefile.orig
+          sed -e 's/SHELL/SHELLZZ/g' < lib/Makefile.orig > lib/Makefile
+          mv doc/Makefile doc/Makefile.orig
+          sed -e 's/SHELL/SHELLZZ/g' < doc/Makefile.orig > doc/Makefile
+          mv examples/Makefile examples/Makefile.orig
+          sed -e 's/SHELL/SHELLZZ/g' < examples/Makefile.orig > examples/Makefile
+          mv tests/Makefile tests/Makefile.orig
+          sed -e 's/SHELL/SHELLZZ/g' < tests/Makefile.orig > tests/Makefile
+          mv xmlwf/Makefile xmlwf/Makefile.orig
+          sed -e 's/SHELL/SHELLZZ/g' < xmlwf/Makefile.orig > xmlwf/Makefile
           echo "make"
           make
           echo "make install"