From 0273b68c9ce66484512d810a98e8a4551e889e1e Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 23 Jul 2019 19:11:15 +0000
Subject: user/openjdk7: move to legacy, only useful for BSing jdk8

---
 user/openjdk7/remove-gawk.patch | 125 ----------------------------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 user/openjdk7/remove-gawk.patch

(limited to 'user/openjdk7/remove-gawk.patch')

diff --git a/user/openjdk7/remove-gawk.patch b/user/openjdk7/remove-gawk.patch
deleted file mode 100644
index dccddbab9..000000000
--- a/user/openjdk7/remove-gawk.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- icedtea-2.6.16/configure.old	2019-01-01 20:11:07.846602426 +0000
-+++ icedtea-2.6.16/configure	2019-02-27 00:23:41.230000000 +0000
-@@ -6881,108 +6881,7 @@
-   LDD="$ac_cv_prog_LDD"
- fi
- 
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}gawk", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gawk; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_GAWK+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $GAWK in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_GAWK="$GAWK" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_GAWK="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--GAWK=$ac_cv_path_GAWK
--if test -n "$GAWK"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAWK" >&5
--$as_echo "$GAWK" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_path_GAWK"; then
--  ac_pt_GAWK=$GAWK
--  # Extract the first word of "gawk", so it can be a program name with args.
--set dummy gawk; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_path_ac_pt_GAWK+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  case $ac_pt_GAWK in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_GAWK="$ac_pt_GAWK" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_ac_pt_GAWK="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--ac_pt_GAWK=$ac_cv_path_ac_pt_GAWK
--if test -n "$ac_pt_GAWK"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GAWK" >&5
--$as_echo "$ac_pt_GAWK" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  if test "x$ac_pt_GAWK" = x; then
--    GAWK=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    GAWK=$ac_pt_GAWK
--  fi
--else
--  GAWK="$ac_cv_path_GAWK"
--fi
--
-- if test x"$GAWK" = x ; then
--   as_fn_error $? "The following program was not found on the PATH: gawk" "$LINENO" 5
-- fi
--
-+GAWK="$AWK"
- 
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}perl", so it can be a program name with args.
---- icedtea-2.6.16/configure.ac.old	2019-01-01 20:09:39.139994680 +0000
-+++ icedtea-2.6.16/configure.ac	2019-02-27 00:25:01.960000000 +0000
-@@ -39,9 +39,7 @@
- IT_FIND_TOOLS([FASTJAR], [fastjar jar])
- IT_FIND_TOOLS([SED],[gsed sed])
- AC_CHECK_TOOL([LDD], [ldd])
--dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
--dnl check for it explicitly rather than using AC_PROG_AWK.
--IT_FIND_TOOL([GAWK], [gawk])
-+IT_FIND_TOOL([GAWK], [awk])
- IT_FIND_TOOL([PERL], [perl])
- IT_CHECK_FOR_MERCURIAL
- IT_OBTAIN_HG_REVISIONS
-- 
cgit v1.2.3-60-g2f50