texlive[66142] Build/source/libs/freetype2: test for grep -E vs.

[commits+karl at tug.org]

Revision: 66142
          http://tug.org/svn/texlive?view=revision&revision=66142
Author:   karl
Date:     2023-02-25 03:07:20 +0100 (Sat, 25 Feb 2023)
Log Message:
-----------
test for grep -E vs. egrep, since neither is universally supported any more

Modified Paths:
--------------
    trunk/Build/source/libs/freetype2/ChangeLog
    trunk/Build/source/libs/freetype2/freetype-src/configure

Added Paths:
-----------
    trunk/Build/source/libs/freetype2/TLpatches/patch-02-grep

Modified: trunk/Build/source/libs/freetype2/ChangeLog
===================================================================
--- trunk/Build/source/libs/freetype2/ChangeLog	2023-02-25 01:05:33 UTC (rev 66141)
+++ trunk/Build/source/libs/freetype2/ChangeLog	2023-02-25 02:07:20 UTC (rev 66142)
@@ -1,3 +1,8 @@
+2023-02-24  Karl Berry  <karl at freefriends.org>
+
+	* freetype-src/configure: test for grep -E, don't assume it.
+	Not present on Solaris 5.10, for which we still build TL.
+
 2023-02-11  Akira Kakuto  <kakuto at jcom.zaq.ne.jp>
 
 	Import freetype-2.13.0.

Added: trunk/Build/source/libs/freetype2/TLpatches/patch-02-grep
===================================================================
--- trunk/Build/source/libs/freetype2/TLpatches/patch-02-grep	                        (rev 0)
+++ trunk/Build/source/libs/freetype2/TLpatches/patch-02-grep	2023-02-25 02:07:20 UTC (rev 66142)
@@ -0,0 +1,36 @@
+grep -E is not supported by system grep on Solaris 5.10.
+But egrep is no longer universally supported either; GNU grep 3.8
+intentionally broke it. So test.
+
+--- configure	(revision 66134)
++++ configure	(working copy)
+@@ -15,10 +15,19 @@
+ 
+ rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
+ 
++if test -z "$EGREP"; then
++  if echo a | grep -E '(a|b)' >/dev/null 2>&1; then 
++    EGREP="grep -E"
++  else
++    # if grep -E doesn't work, assume egrep does.
++    EGREP=egrep
++  fi
++fi   
++
+ # respect GNUMAKE environment variable for backward compatibility
+ if test "x$GNUMAKE" = x; then
+   if test "x$MAKE" = x; then
+-    if test "x`make -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
++    if test "x`make -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
+       MAKE=gmake
+     else
+       MAKE=make
+@@ -28,7 +37,7 @@
+   MAKE=$GNUMAKE
+ fi
+ 
+-if test "x`$MAKE -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
++if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
+   echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2
+   echo "Please try" >&2
+   echo >&2

Modified: trunk/Build/source/libs/freetype2/freetype-src/configure
===================================================================
--- trunk/Build/source/libs/freetype2/freetype-src/configure	2023-02-25 01:05:33 UTC (rev 66141)
+++ trunk/Build/source/libs/freetype2/freetype-src/configure	2023-02-25 02:07:20 UTC (rev 66142)
@@ -15,10 +15,19 @@
 
 rm -f config.mk builds/unix/unix-def.mk builds/unix/unix-cc.mk
 
+if test -z "$EGREP"; then
+  if echo a | grep -E '(a|b)' >/dev/null 2>&1; then 
+    EGREP="grep -E"
+  else
+    # if grep -E doesn't work, assume egrep does.
+    EGREP=egrep
+  fi
+fi   
+
 # respect GNUMAKE environment variable for backward compatibility
 if test "x$GNUMAKE" = x; then
   if test "x$MAKE" = x; then
-    if test "x`make -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
+    if test "x`make -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
       MAKE=gmake
     else
       MAKE=make
@@ -28,7 +37,7 @@
   MAKE=$GNUMAKE
 fi
 
-if test "x`$MAKE -v 2>/dev/null | grep -E 'GNU|makepp'`" = x; then
+if test "x`$MAKE -v 2>/dev/null | $EGREP 'GNU|makepp'`" = x; then
   echo "GNU make (>= 3.81) or makepp (>= 2.0) is required to build FreeType2." >&2
   echo "Please try" >&2
   echo >&2