From fbaa9dbb0994d71e801e9fba8236887923aa0cf8 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Thu, 17 Jan 2019 10:16:19 +0400
Subject: Fix a particular sed invocation in otp_build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise sed cannot process `lib/common_test/test_server/configure.in`
when run under UTF-8 locale.  That file uses m4’s changequote(«, »)`,
in latin-1.
---
 otp_build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/otp_build b/otp_build
index 175c5fbcfe..376ea630b5 100755
--- a/otp_build
+++ b/otp_build
@@ -317,7 +317,7 @@ do_autoconf ()
 
 	    echo "=== running autoconf in $d"
 	    ( cd "$d" && autoconf ) || exit 1
-	    chdr=`cat "$file" | sed -n "s|.*\(AC_CONFIG_HEADER\).*|\1|p"`
+	    chdr=`cat "$file" | LC_CTYPE=C sed -n "s|.*\(AC_CONFIG_HEADER\).*|\1|p"`
 	    [ "$chdr" = "AC_CONFIG_HEADER" ] || continue
 	    echo "=== running autoheader in $d"
 	    ( cd "$d" && autoheader ) || exit 1
-- 
cgit v1.2.3


From 1985e827122e84f2d323a493112bded76fc5e4f1 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Wed, 20 Feb 2019 14:35:23 +0400
Subject: Revert "Fix a particular sed invocation in otp_build"

This reverts commit c8544cf07399555b61d84174e0887966f982deea.
---
 otp_build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/otp_build b/otp_build
index 376ea630b5..175c5fbcfe 100755
--- a/otp_build
+++ b/otp_build
@@ -317,7 +317,7 @@ do_autoconf ()
 
 	    echo "=== running autoconf in $d"
 	    ( cd "$d" && autoconf ) || exit 1
-	    chdr=`cat "$file" | LC_CTYPE=C sed -n "s|.*\(AC_CONFIG_HEADER\).*|\1|p"`
+	    chdr=`cat "$file" | sed -n "s|.*\(AC_CONFIG_HEADER\).*|\1|p"`
 	    [ "$chdr" = "AC_CONFIG_HEADER" ] || continue
 	    echo "=== running autoheader in $d"
 	    ( cd "$d" && autoheader ) || exit 1
-- 
cgit v1.2.3


From 666cb78d79878260272ab8a7da5adf2684ca672c Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Wed, 20 Feb 2019 15:05:58 +0400
Subject: =?UTF-8?q?use=20erts=E2=80=99=20ERL=5FTRY=5FLINK=5FJAVA=20in=20co?=
 =?UTF-8?q?mmon=5Ftest/test=5Fserver/configure.in?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common_test/test_server/configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/common_test/test_server/configure.in b/lib/common_test/test_server/configure.in
index 0511d126b4..e07bd4c2aa 100644
--- a/lib/common_test/test_server/configure.in
+++ b/lib/common_test/test_server/configure.in
@@ -459,11 +459,11 @@ dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a
 dnl AC_LANG_JAVA instead...)
 AC_DEFUN(ERL_TRY_LINK_JAVA,
 [java_link='$JAVAC conftest.java 1>&AC_FD_CC'
-changequote(«, »)dnl
+changequote(, )dnl
 cat > conftest.java <<EOF
-«$1»
+$1
 class conftest { public static void main(String[] args) {
-   «$2»
+   $2
    ; return; }}
 EOF
 changequote([, ])dnl
-- 
cgit v1.2.3