From 3917b4f6aec003e9c182e8dd6e16a5b7da4ac588 Mon Sep 17 00:00:00 2001
From: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
Date: Mon, 2 Jan 2017 10:36:29 -0500
Subject: [PATCH] build: remove ant dependency

Ant 1.9.7 is not needed anymore in our build process and since it is not
distributed anymore by apache, instead of bumping to 1.9.8, remove it.

Change-Id: Iac91d47aa74bbba5161d641b7f19564a517f89bf
---
 extras/tools/bootstrap    |  1 -
 extras/tools/packages.mak |  3 ---
 extras/tools/tools.mak    | 18 ------------------
 3 files changed, 22 deletions(-)

diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index d6fa936e7..c03cb6c67 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -79,7 +79,6 @@ check cmake 3.2.2
 check yasm
 check_tar
 check_sed
-check ant
 check gettext
 
 [ -n "$NEEDED" ] && mkdir -p build/ && echo "To-be-built packages: `echo $NEEDED | sed 's/\.//g'`"
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 98f0b6f12..a7b808024 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -37,8 +37,5 @@ GAS_URL=http://git.libav.org/?p=gas-preprocessor.git;a=snapshot;h=$(GAS_VERSION)
 SED_VERSION=4.2.2
 SED_URL=$(GNU)/sed/sed-$(SED_VERSION).tar.bz2
 
-ANT_VERSION=1.9.7
-ANT_URL=$(APACHE)/ant/binaries/apache-ant-$(ANT_VERSION)-bin.tar.bz2
-
 GETTEXT_VERSION=0.19.6
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 5cfd1ec63..19f477418 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -244,24 +244,6 @@ CLEAN_PKG += sed
 DISTCLEAN_PKG += sed-$(SED_VERSION).tar.bz2
 CLEAN_FILE += .sed
 
-# Apache ANT
-
-apache-ant-$(ANT_VERSION).tar.bz2:
-	$(call download,$(ANT_URL))
-
-ant: apache-ant-$(ANT_VERSION).tar.bz2
-	$(UNPACK)
-	$(MOVE)
-
-.ant: ant
-	(mkdir -p $(PREFIX)/bin && cp $</bin/* $(PREFIX)/bin/)
-	(mkdir -p $(PREFIX)/lib && cp $</lib/* $(PREFIX)/lib/)
-	touch $@
-
-CLEAN_PKG += ant
-DISTCLEAN_PKG += apache-ant-$(ANT_VERSION).tar.bz2
-CLEAN_FILE += .ant
-
 # GNU gettext
 
 gettext-$(GETTEXT_VERSION).tar.gz: