From f7f647a8320b02398a6a51d34b4cc74f56a5914d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 1 Apr 2017 21:09:09 +0200 Subject: [PATCH] pacakge/dieharder: fix autoreconf When dieharder was committed, Thomas removed the hook to cleanup the m4 files, on the reason that autoreconf would recreate the broken symlinks (and because the hook was too complex). It turns out the hook was needed: if the symbolic links are broken (libtool not installed on the host machine), autoreconf fails to do its job. Reinstate a simpler hook. Fixes: http://autobuild.buildroot.org/results/a92/a92e9a74b0966f8f0bc4080f918d5ddf4c1ec0ce/ http://autobuild.buildroot.org/results/a4f/a4f6647f69ad89ff1ffe5f1331281fb7a57ade4e/ Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Julien Viard de Galbert Signed-off-by: Thomas Petazzoni --- package/dieharder/dieharder.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/dieharder/dieharder.mk b/package/dieharder/dieharder.mk index 05ca25311f..c3eee64553 100644 --- a/package/dieharder/dieharder.mk +++ b/package/dieharder/dieharder.mk @@ -15,13 +15,17 @@ DIEHARDER_DEPENDENCIES = gsl # The original configure does not use variables provided in the # environment so _CONF_ENV does not work. (_CONF_OPTS does). # -# In addition, the m4/*.m4 files are symlinks to /usr/share, which -# clearly doesn't work, so doing an autoreconf replaces them. -# # Finally, we patch configure.ac and some Makefile.am so we need to # autoreconf anyway DIEHARDER_AUTORECONF = YES +# The m4/*.m4 files are symlinks to /usr/share, which clearly doesn't +# work, and doing an autoreconf does not replace them. +define DIEHARDER_M4_CLEAN + rm -f $(@D)/m4/*.m4 +endef +DIEHARDER_POST_PATCH_HOOKS += DIEHARDER_M4_CLEAN + # fix endianness detection ifeq ($(BR2_ENDIAN),"BIG") DIEHARDER_CONF_ENV = ac_cv_c_endian=big -- 2.30.2