diff options
Diffstat (limited to 'Build/source/libs/freetype2/TLpatches/patch-02-grep')
-rw-r--r-- | Build/source/libs/freetype2/TLpatches/patch-02-grep | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/Build/source/libs/freetype2/TLpatches/patch-02-grep b/Build/source/libs/freetype2/TLpatches/patch-02-grep deleted file mode 100644 index 4a545b28af6..00000000000 --- a/Build/source/libs/freetype2/TLpatches/patch-02-grep +++ /dev/null @@ -1,36 +0,0 @@ -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 |