From a7f837c98b0ab3fde1b19283e13a21fdaf1b1ee2 Mon Sep 17 00:00:00 2001 From: Oskari Rauta Date: Wed, 4 Oct 2023 23:46:57 +0200 Subject: [PATCH] zsh: use autoreconf PKG_FIXUP to configure In preparation to PCRE2 fixup, use autoreconf PKG_FIXUP as a better configure system instead of configure script. This is needed to reduce upcoming patch to migrate to PCRE2 library. To correctly use autoreconf it's needed to declare empty PKG_REMOVE_FILES. zsh include custom macro in the default aclocal.m4 When autoreconf PKG_FIXUP is used, if PKG_REMOVE_FILES is not defined, it's set to remove the file aclocal.m4 by default resulting in problem with the custom macro AC_PROG_LN. Signed-off-by: Oskari Rauta [ split to 2 commit, add PKG_REMOVE_FILES, reword commit description ] Signed-off-by: Christian Marangi --- utils/zsh/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/utils/zsh/Makefile b/utils/zsh/Makefile index 6fc713a5db..819dbe4ae2 100644 --- a/utils/zsh/Makefile +++ b/utils/zsh/Makefile @@ -20,10 +20,19 @@ PKG_LICENSE:=ZSH PKG_LICENSE_FILES:=LICENCE PKG_CPE_ID:=cpe:/a:zsh_project:zsh +PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_BUILD_FLAGS:=gc-sections lto +# zsh include custom macro in the default aclocal.m4 +# When autoreconf PKG_FIXUP is used, if PKG_REMOVE_FILES +# is not defined, it's set to remove the file aclocak.m4 +# by default resulting in problem with the custom macro +# AC_PROG_LN +# To prevent this, declare empty PKG_REMOVE_FILES +PKG_REMOVE_FILES:= + include $(INCLUDE_DIR)/package.mk define Package/zsh