From a10c67b05727ec8b773771f60127cac39ffa90f8 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 14 Oct 2018 16:42:45 +0200 Subject: tools: patch: Fix build by not modifing Makefile.am A new test case was adding in one of the patches fixing a problem, this also included a change in the test/Makefile.am to add this test case. The build system detected a change in the Makefile.am and wants to regenerate the Makefile.in, but this fails because automake-1.15 is not installed yet. As automake depends on patch being build first, make sure we do not modify the Makefile.am. This fixes build problem seen by the build bots. Fixes: 4797dddfde6 ("patch: apply upstream cve fixes") Signed-off-by: Hauke Mehrtens (backported from 759f111f8d7f2d9f5f12713fc6f48ce6422997ec) --- tools/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'tools/Makefile') diff --git a/tools/Makefile b/tools/Makefile index 6766d7df6e..d2b5daf18c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -66,7 +66,6 @@ $(curdir)/bc/compile := $(curdir)/bison/compile $(curdir)/findutils/compile := $(curdir)/bison/compile $(curdir)/gengetopt/compile := $(curdir)/libtool/compile $(curdir)/patchelf/compile := $(curdir)/libtool/compile -$(curdir)/patch/compile := $(curdir)/automake/compile $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/libressl/compile := $(curdir)/pkg-config/compile $(curdir)/mkimage/compile += $(curdir)/libressl/compile -- cgit v1.2.3