remove the hook for creating the m4 directory

Now that we do not override the automagic handling of include
directories witbh aclocal, the missing m4 directories will be
automatically created by aclocal itself.

So we can drop of hooks.

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
[yann.morin.1998@free.fr: slight rewording in the commit log]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Heiko Thiery 2020-02-04 13:40:13 +01:00 committed by Yann E. MORIN
parent d255b67972
commit 64c42c5e2c
28 changed files with 0 additions and 171 deletions

View File

@ -12,10 +12,4 @@ ATEST_DEPENDENCIES = host-pkgconf libev alsa-lib
# Fetched from Github, with no configure script # Fetched from Github, with no configure script
ATEST_AUTORECONF = YES ATEST_AUTORECONF = YES
# Autoreconf requires an existing m4 directory
define ATEST_PATCH_M4
mkdir -p $(@D)/m4
endef
ATEST_POST_PATCH_HOOKS += ATEST_PATCH_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -15,10 +15,4 @@ BAYER2RGB_NEON_AUTORECONF = YES
BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mfpu=neon" BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mfpu=neon"
define BAYER2RGB_NEON_PRE_CONFIGURE_FIXUP
mkdir -p $(@D)/m4
endef
BAYER2RGB_NEON_PRE_CONFIGURE_HOOKS += BAYER2RGB_NEON_PRE_CONFIGURE_FIXUP
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -13,12 +13,6 @@ BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf
# git repo, no configure # git repo, no configure
BLUEZ_ALSA_AUTORECONF = YES BLUEZ_ALSA_AUTORECONF = YES
# Autoreconf requires an existing m4 directory
define BLUEZ_ALSA_MKDIR_M4
mkdir -p $(@D)/m4
endef
BLUEZ_ALSA_POST_PATCH_HOOKS += BLUEZ_ALSA_MKDIR_M4
BLUEZ_ALSA_CONF_OPTS = \ BLUEZ_ALSA_CONF_OPTS = \
--enable-aplay \ --enable-aplay \
--disable-debug-time \ --disable-debug-time \

View File

@ -12,9 +12,4 @@ DAVICI_DEPENDENCIES = strongswan
DAVICI_INSTALL_STAGING = YES DAVICI_INSTALL_STAGING = YES
DAVICI_AUTORECONF = YES DAVICI_AUTORECONF = YES
define DAVICI_CREATE_M4
mkdir -p $(@D)/m4
endef
DAVICI_POST_PATCH_HOOKS += DAVICI_CREATE_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -14,12 +14,6 @@ DROPWATCH_LICENSE_FILES = COPYING
# From git # From git
DROPWATCH_AUTORECONF = YES DROPWATCH_AUTORECONF = YES
# Autoreconf step fails due to missing m4 directory
define DROPWATCH_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
DROPWATCH_PRE_CONFIGURE_HOOKS += DROPWATCH_CREATE_M4_DIR
DROPWATCH_CONF_OPTS = --without-bfd DROPWATCH_CONF_OPTS = --without-bfd
DROPWATCH_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) DROPWATCH_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS)

View File

@ -37,11 +37,4 @@ else
GST_FSL_PLUGINS_CONF_OPTS += --disable-x11 GST_FSL_PLUGINS_CONF_OPTS += --disable-x11
endif endif
# Autoreconf requires an m4 directory to exist
define GST_FSL_PLUGINS_PATCH_M4
mkdir -p $(@D)/m4
endef
GST_FSL_PLUGINS_POST_PATCH_HOOKS += GST_FSL_PLUGINS_PATCH_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -20,9 +20,4 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \
GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES GST1_PLUGINS_BAYER2RGB_NEON_AUTORECONF = YES
define GST1_PLUGINS_BAYER2RGB_NEON_PRE_CONFIGURE_FIXUP
mkdir -p $(@D)/m4
endef
GST1_PLUGINS_BAYER2RGB_NEON_PRE_CONFIGURE_HOOKS += GST1_PLUGINS_BAYER2RGB_NEON_PRE_CONFIGURE_FIXUP
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -66,13 +66,6 @@ HOST_GUTENPRINT_CONF_OPTS = \
--disable-testpattern \ --disable-testpattern \
--without-cups --without-cups
# Needed by autoreconf
define GUTENPRINT_CREATE_M4_DIR
mkdir -p $(@D)/m4local
endef
GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/include cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/include
endef endef

View File

@ -40,13 +40,6 @@ else
IRQBALANCE_CONF_OPTS += --without-systemd IRQBALANCE_CONF_OPTS += --without-systemd
endif endif
# This would be done by the package's autogen.sh script
define IRQBALANCE_PRECONFIGURE
mkdir -p $(@D)/m4
endef
IRQBALANCE_PRE_CONFIGURE_HOOKS += IRQBALANCE_PRECONFIGURE
define IRQBALANCE_INSTALL_INIT_SYSV define IRQBALANCE_INSTALL_INIT_SYSV
$(INSTALL) -D -m 755 package/irqbalance/S13irqbalance \ $(INSTALL) -D -m 755 package/irqbalance/S13irqbalance \
$(TARGET_DIR)/etc/init.d/S13irqbalance $(TARGET_DIR)/etc/init.d/S13irqbalance

View File

@ -24,11 +24,4 @@ ifeq ($(BR2_arm),y)
JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm" JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm"
endif endif
# Needed for autoreconf
define JAMVM_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
JAMVM_POST_PATCH_HOOKS += JAMVM_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -17,11 +17,6 @@ JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \
# configure.ac. # configure.ac.
JANUS_GATEWAY_AUTORECONF = YES JANUS_GATEWAY_AUTORECONF = YES
define JANUS_GATEWAY_M4
mkdir -p $(@D)/m4
endef
JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4
JANUS_GATEWAY_CONF_OPTS = \ JANUS_GATEWAY_CONF_OPTS = \
--disable-data-channels \ --disable-data-channels \
--disable-sample-event-handler --disable-sample-event-handler

View File

@ -11,10 +11,4 @@ LCDAPI_LICENSE_FILES = COPYING
LCDAPI_AUTORECONF = YES LCDAPI_AUTORECONF = YES
LCDAPI_INSTALL_STAGING = YES LCDAPI_INSTALL_STAGING = YES
define LCDAPI_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
LCDAPI_POST_PATCH_HOOKS += LCDAPI_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -12,11 +12,4 @@ LIBDMTX_INSTALL_STAGING = YES
# github tarball does not include configure # github tarball does not include configure
LIBDMTX_AUTORECONF = YES LIBDMTX_AUTORECONF = YES
# Create the m4 directory (missing from the archive).
# This is required for autoconf.
define LIBDMTX_CREATE_M4
mkdir -p $(@D)/m4
endef
LIBDMTX_PRE_CONFIGURE_HOOKS += LIBDMTX_CREATE_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -14,10 +14,4 @@ LIBISCSI_AUTORECONF = YES
LIBISCSI_CONF_OPTS = --disable-examples --disable-werror --disable-manpages \ LIBISCSI_CONF_OPTS = --disable-examples --disable-werror --disable-manpages \
--disable-test-tool --disable-tests --disable-test-tool --disable-tests
# We need to create the m4 directory to make autoreconf work properly.
define LIBISCSI_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
LIBISCSI_POST_PATCH_HOOKS += LIBISCSI_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -19,10 +19,4 @@ LIBPAM_NFC_CONF_OPTS = \
# libpam breaks with parallel build, but is very fast to build. # libpam breaks with parallel build, but is very fast to build.
LIBPAM_NFC_MAKE = $(MAKE1) LIBPAM_NFC_MAKE = $(MAKE1)
# Autoreconf requires an existing m4 directory
define LIBPAM_NFC_MKDIR_M4
mkdir -p $(@D)/m4
endef
LIBPAM_NFC_PRE_CONFIGURE_HOOKS += LIBPAM_NFC_MKDIR_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -12,9 +12,4 @@ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT
LIBSOUNDTOUCH_AUTORECONF = YES LIBSOUNDTOUCH_AUTORECONF = YES
LIBSOUNDTOUCH_INSTALL_STAGING = YES LIBSOUNDTOUCH_INSTALL_STAGING = YES
define LIBSOUNDTOUCH_CREATE_CONFIG_M4
mkdir -p $(@D)/config/m4
endef
LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -11,10 +11,4 @@ LIBVA_UTILS_LICENSE = MIT
LIBVA_UTILS_LICENSE_FILES = COPYING LIBVA_UTILS_LICENSE_FILES = COPYING
LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva
define LIBVA_UTILS_CREATE_M4_DIR
@mkdir -p $(@D)/m4
endef
LIBVA_UTILS_POST_EXTRACT_HOOKS += LIBVA_UTILS_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -12,11 +12,6 @@ LTRACE_LICENSE = GPL-2.0
LTRACE_LICENSE_FILES = COPYING LTRACE_LICENSE_FILES = COPYING
LTRACE_AUTORECONF = YES LTRACE_AUTORECONF = YES
define LTRACE_CREATE_CONFIG_M4
mkdir -p $(@D)/config/m4
endef
LTRACE_POST_PATCH_HOOKS += LTRACE_CREATE_CONFIG_M4
# ltrace can use libunwind only if libc has backtrace() support # ltrace can use libunwind only if libc has backtrace() support
# We don't normally do so for uClibc and we can't know if it's external # We don't normally do so for uClibc and we can't know if it's external
# Also ltrace with libunwind support is broken for MIPS so we disable it # Also ltrace with libunwind support is broken for MIPS so we disable it

View File

@ -13,10 +13,4 @@ MFOC_DEPENDENCIES = libnfc
MFOC_AUTORECONF = YES MFOC_AUTORECONF = YES
MFOC_INSTALL_STAGING = YES MFOC_INSTALL_STAGING = YES
# Autoreconf requires an existing m4 directory
define MFOC_MKDIR_M4
mkdir -p $(@D)/m4
endef
MFOC_PRE_CONFIGURE_HOOKS += MFOC_MKDIR_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -16,12 +16,6 @@ MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \
# add host-gettext for AM_ICONV macro # add host-gettext for AM_ICONV macro
MINICOM_DEPENDENCIES += host-gettext MINICOM_DEPENDENCIES += host-gettext
# Autoreconf requires an existing m4 directory
define MINICOM_MKDIR_M4
mkdir -p $(@D)/m4
endef
MINICOM_POST_PATCH_HOOKS += MINICOM_MKDIR_M4
MINICOM_CONF_OPTS = \ MINICOM_CONF_OPTS = \
--enable-dfl-port=/dev/ttyS1 \ --enable-dfl-port=/dev/ttyS1 \
--enable-lock-dir=/var/lock --enable-lock-dir=/var/lock

View File

@ -13,9 +13,4 @@ MUSL_FTS_LICENSE_FILES = COPYING
MUSL_FTS_DEPENDENCIES = host-pkgconf MUSL_FTS_DEPENDENCIES = host-pkgconf
MUSL_FTS_INSTALL_STAGING = YES MUSL_FTS_INSTALL_STAGING = YES
define MUSL_FTS_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
MUSL_FTS_POST_PATCH_HOOKS += MUSL_FTS_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -13,12 +13,4 @@ OPEN_LLDP_LICENSE_FILES = COPYING
# Fetching from git, need to generate configure/Makefile.in # Fetching from git, need to generate configure/Makefile.in
OPEN_LLDP_AUTORECONF = YES OPEN_LLDP_AUTORECONF = YES
# Create the m4 directory (missing from the archive).
# This is required for autoconf.
define OPEN_LLDP_CREATE_M4
mkdir -p $(@D)/m4
endef
OPEN_LLDP_PRE_CONFIGURE_HOOKS += OPEN_LLDP_CREATE_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -12,14 +12,6 @@ OPENPGM_INSTALL_STAGING = YES
OPENPGM_SUBDIR = openpgm/pgm OPENPGM_SUBDIR = openpgm/pgm
OPENPGM_AUTORECONF = YES OPENPGM_AUTORECONF = YES
# We need to create the m4 directory to make sure that autoreconf will
# start calling libtoolize. Otherwise it will start with aclocal and it
# will fail because the m4 directory doesn't exist.
define OPENPGM_CREATE_M4_DIR
mkdir -p $(@D)/$(OPENPGM_SUBDIR)/m4
endef
OPENPGM_POST_PATCH_HOOKS += OPENPGM_CREATE_M4_DIR
OPENPGM_CONF_ENV = \ OPENPGM_CONF_ENV = \
ac_cv_file__proc_cpuinfo=yes \ ac_cv_file__proc_cpuinfo=yes \
ac_cv_file__dev_rtc=no \ ac_cv_file__dev_rtc=no \

View File

@ -13,9 +13,4 @@ PDBG_DEPENDENCIES = host-dtc
PDBG_MAKE_OPTS = "GIT_SHA1=\"v$(PDBG_VERSION)\"" PDBG_MAKE_OPTS = "GIT_SHA1=\"v$(PDBG_VERSION)\""
define PDBG_PATCH_M4
mkdir -p $(@D)/m4
endef
PDBG_POST_PATCH_HOOKS += PDBG_PATCH_M4
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -22,11 +22,5 @@ SDBUSPLUS_INSTALL_STAGING = YES
SDBUSPLUS_LICENSE = Apache-2.0 SDBUSPLUS_LICENSE = Apache-2.0
SDBUSPLUS_LICENSE_FILES = LICENSE SDBUSPLUS_LICENSE_FILES = LICENSE
define SDBUSPLUS_CREATE_M4
mkdir -p $(@D)/m4
endef
SDBUSPLUS_POST_PATCH_HOOKS += SDBUSPLUS_CREATE_M4
HOST_SDBUSPLUS_POST_PATCH_HOOKS += SDBUSPLUS_CREATE_M4
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))

View File

@ -13,10 +13,4 @@ SPEEXDSP_INSTALL_STAGING = YES
SPEEXDSP_DEPENDENCIES = host-pkgconf SPEEXDSP_DEPENDENCIES = host-pkgconf
SPEEXDSP_AUTORECONF = YES SPEEXDSP_AUTORECONF = YES
# Autoreconf step fails due to missing m4 directory
define SPEEXDSP_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
SPEEXDSP_PRE_CONFIGURE_HOOKS += SPEEXDSP_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -14,10 +14,4 @@ ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y)
SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf
endif endif
define SYSPROF_CREATE_M4_DIR
mkdir -p $(@D)/m4
endef
SYSPROF_POST_PATCH_HOOKS += SYSPROF_CREATE_M4_DIR
$(eval $(autotools-package)) $(eval $(autotools-package))

View File

@ -53,13 +53,6 @@ TESSERACT_OCR_EXTRA_DOWNLOADS = \
$(addprefix https://github.com/tesseract-ocr/tessdata/raw/$(TESSERACT_OCR_DATA_VERSION)/,\ $(addprefix https://github.com/tesseract-ocr/tessdata/raw/$(TESSERACT_OCR_DATA_VERSION)/,\
$(TESSERACT_OCR_DATA_FILES)) $(TESSERACT_OCR_DATA_FILES))
define TESSERACT_OCR_PRECONFIGURE
# Autoreconf step fails due to missing m4 directory
mkdir -p $(@D)/m4
endef
TESSERACT_OCR_PRE_CONFIGURE_HOOKS += TESSERACT_OCR_PRECONFIGURE
# Language data files installation # Language data files installation
define TESSERACT_OCR_INSTALL_LANG_DATA define TESSERACT_OCR_INSTALL_LANG_DATA
$(foreach langfile,$(TESSERACT_OCR_DATA_FILES), \ $(foreach langfile,$(TESSERACT_OCR_DATA_FILES), \