remove the hook for creating the m4 directory
authorHeiko Thiery <heiko.thiery@gmail.com>
Tue, 4 Feb 2020 12:40:13 +0000 (13:40 +0100)
committerYann E. MORIN <yann.morin.1998@free.fr>
Tue, 4 Feb 2020 13:11:39 +0000 (14:11 +0100)
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>
28 files changed:
package/atest/atest.mk
package/bayer2rgb-neon/bayer2rgb-neon.mk
package/bluez-alsa/bluez-alsa.mk
package/davici/davici.mk
package/dropwatch/dropwatch.mk
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
package/gutenprint/gutenprint.mk
package/irqbalance/irqbalance.mk
package/jamvm/jamvm.mk
package/janus-gateway/janus-gateway.mk
package/lcdapi/lcdapi.mk
package/libdmtx/libdmtx.mk
package/libiscsi/libiscsi.mk
package/libpam-nfc/libpam-nfc.mk
package/libsoundtouch/libsoundtouch.mk
package/libva-utils/libva-utils.mk
package/ltrace/ltrace.mk
package/mfoc/mfoc.mk
package/minicom/minicom.mk
package/musl-fts/musl-fts.mk
package/open-lldp/open-lldp.mk
package/openpgm/openpgm.mk
package/pdbg/pdbg.mk
package/sdbusplus/sdbusplus.mk
package/speexdsp/speexdsp.mk
package/sysprof/sysprof.mk
package/tesseract-ocr/tesseract-ocr.mk

index 2effda5711c515606751210681873836fc9ca82e..68def46cf99cdc9641cf0d00cbf97309fd394e41 100644 (file)
@@ -12,10 +12,4 @@ ATEST_DEPENDENCIES = host-pkgconf libev alsa-lib
 # Fetched from Github, with no configure script
 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))
index 02651dcfeedd6aba9b9707f22dc7a5ea770612cb..34510e76165aebdfc20e316a9aea04221e73b3b1 100644 (file)
@@ -15,10 +15,4 @@ BAYER2RGB_NEON_AUTORECONF = YES
 
 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))
index c5a51ce5d4acfb4c53e3b79bc77ae5c6e28dcb4c..6726298f5bbeeab2da3d61318f7a5d7050d6d679 100644 (file)
@@ -13,12 +13,6 @@ BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf
 # git repo, no configure
 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 = \
        --enable-aplay \
        --disable-debug-time \
index a90eeeefef37316e7f4c44a5303a1c8efc8bf6bd..5c08bbe0da613e33036f077e659f54fd27ef6dbf 100644 (file)
@@ -12,9 +12,4 @@ DAVICI_DEPENDENCIES = strongswan
 DAVICI_INSTALL_STAGING = YES
 DAVICI_AUTORECONF = YES
 
-define DAVICI_CREATE_M4
-       mkdir -p $(@D)/m4
-endef
-DAVICI_POST_PATCH_HOOKS += DAVICI_CREATE_M4
-
 $(eval $(autotools-package))
index 769b4d4d38c4e78daad1b6bc90227df728949491..c5873ccf7693e06d083c77f2d17ae518b1479d67 100644 (file)
@@ -14,12 +14,6 @@ DROPWATCH_LICENSE_FILES = COPYING
 # From git
 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_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS)
 
index 547d253e88dc3fab994bad9461651157588d465d..5933efa53390a7091132da762bb2d2e2ba9796b5 100644 (file)
@@ -37,11 +37,4 @@ else
 GST_FSL_PLUGINS_CONF_OPTS += --disable-x11
 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))
index d6c3c362726a50cd48228c6a94dd30888870a5fc..734800a74b5d6a4b495c3e9bdef74ec242d6f237 100644 (file)
@@ -20,9 +20,4 @@ GST1_PLUGINS_BAYER2RGB_NEON_DEPENDENCIES = \
 
 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))
index 3465ec8b8559e102721b6ea0dbda23e4c46ae32c..e99d62ca791b8174d7f7b27e84f41b0055ca68d4 100644 (file)
@@ -66,13 +66,6 @@ HOST_GUTENPRINT_CONF_OPTS = \
        --disable-testpattern \
        --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
        cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/include
 endef
index 16967aa8c0605e7bca8b1ce211f91e19febad1b3..36e9e4249377b22f97cdb99da7a4c5f1e2539104 100644 (file)
@@ -40,13 +40,6 @@ else
 IRQBALANCE_CONF_OPTS += --without-systemd
 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
        $(INSTALL) -D -m 755 package/irqbalance/S13irqbalance \
                $(TARGET_DIR)/etc/init.d/S13irqbalance
index 3fcf460bcd2cbc5829156a1a0bd89f36e7b8b845..26615ef7a3ad27283aab868a7a15b9dc20d708df 100644 (file)
@@ -24,11 +24,4 @@ ifeq ($(BR2_arm),y)
 JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm"
 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))
index b0c01f3173a4f6275fde3dad06e6375a763e0848..0d0a22491f18fee952cbd0833b7c116c5c843ce7 100644 (file)
@@ -17,11 +17,6 @@ JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \
 # configure.ac.
 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 = \
        --disable-data-channels \
        --disable-sample-event-handler
index 11eee880a67f1bd111554fb84f621408a31ad476..f6b14cd2c9644ed33403588f1f969a2699783181 100644 (file)
@@ -11,10 +11,4 @@ LCDAPI_LICENSE_FILES = COPYING
 LCDAPI_AUTORECONF = 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))
index 39fb8d1a4d4342fc0fe83f11d541c4f7cd6c7f0a..04e089f1f79bed2ad6ab4d4021eecc99772f74c1 100644 (file)
@@ -12,11 +12,4 @@ LIBDMTX_INSTALL_STAGING = YES
 # github tarball does not include configure
 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))
index f0b003b347349e6ce3cb4134f8dd14101b9217ba..c8b6ddd123cd3c91868edfa511374d96cb1f1aae 100644 (file)
@@ -14,10 +14,4 @@ LIBISCSI_AUTORECONF = YES
 LIBISCSI_CONF_OPTS = --disable-examples --disable-werror --disable-manpages \
        --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))
index fc283c8777f4cb59abddf4af6b98d6d8af826135..d4f6d446cfd69853124993b621b29dcc058067c7 100644 (file)
@@ -19,10 +19,4 @@ LIBPAM_NFC_CONF_OPTS = \
 # libpam breaks with parallel build, but is very fast to build.
 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))
index c4ac930be16fbb816aa6c5ce0f8cc68434811820..fcc2332fad5ef151effc5be84d2ac61dc86967d1 100644 (file)
@@ -12,9 +12,4 @@ LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT
 LIBSOUNDTOUCH_AUTORECONF = 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))
index 40b05e45902a092a80a9e58a1bafe2acd117bb27..ad9acb229bd0d11a451cf903298f8f358a7dc633 100644 (file)
@@ -11,10 +11,4 @@ LIBVA_UTILS_LICENSE = MIT
 LIBVA_UTILS_LICENSE_FILES = COPYING
 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))
index 6dfbb58c358db5e12d53812abdeb4ab6a52ec5f5..b71215e43be45db79b32c9328da58f7994bc4822 100644 (file)
@@ -12,11 +12,6 @@ LTRACE_LICENSE = GPL-2.0
 LTRACE_LICENSE_FILES = COPYING
 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
 # 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
index 15105a74ab09d0ed7e00de9f19c6d9313ee71024..c4a785212fae8681f7547014f5cae4cc15ebcfad 100644 (file)
@@ -13,10 +13,4 @@ MFOC_DEPENDENCIES = libnfc
 MFOC_AUTORECONF = 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))
index a86d587b2f5e76ce6a9b8f7cddd5179b9891297f..d299dac43df75649abaee4c6c81e5b9b0dfdef92 100644 (file)
@@ -16,12 +16,6 @@ MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \
 # add host-gettext for AM_ICONV macro
 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 = \
        --enable-dfl-port=/dev/ttyS1 \
        --enable-lock-dir=/var/lock
index d1999acb177613ce586c580f0a9a36413f1a910c..dd7f1f9ea0d0ce6d685e82575e367a5fb78b6671 100644 (file)
@@ -13,9 +13,4 @@ MUSL_FTS_LICENSE_FILES = COPYING
 MUSL_FTS_DEPENDENCIES = host-pkgconf
 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))
index b650aea3c1a8aebf546e7b87e18623d72fd63d8c..c9fd958a4f401642de176e600ab4afc3a287a34a 100644 (file)
@@ -13,12 +13,4 @@ OPEN_LLDP_LICENSE_FILES = COPYING
 # Fetching from git, need to generate configure/Makefile.in
 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))
index 8163982d373014ff0cddfee3faf4e9ed01fa4ec1..ec293b42df3ef4ad1f60d9d1705a0c7d6bf632e1 100644 (file)
@@ -12,14 +12,6 @@ OPENPGM_INSTALL_STAGING = YES
 OPENPGM_SUBDIR = openpgm/pgm
 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 = \
        ac_cv_file__proc_cpuinfo=yes \
        ac_cv_file__dev_rtc=no \
index 1832e235ec8dd953d75455e455e43887ae152d0d..9977a126fb6213c5f9a4a06fcd5f0f57acf2d6b6 100644 (file)
@@ -13,9 +13,4 @@ PDBG_DEPENDENCIES = host-dtc
 
 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))
index e7a3dc2665210f782ac3a9ee85f99276ac4f0014..9d3d1e8cf46bd49c34aaa8ec2fa122ea6677b7ab 100644 (file)
@@ -22,11 +22,5 @@ SDBUSPLUS_INSTALL_STAGING = YES
 SDBUSPLUS_LICENSE = Apache-2.0
 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 $(host-autotools-package))
index f5a46cd9de0496f869dffa295a3729be80da2a9a..901f22b9e63eae67d871ad4c7f23bb3e1c480f2e 100644 (file)
@@ -13,10 +13,4 @@ SPEEXDSP_INSTALL_STAGING = YES
 SPEEXDSP_DEPENDENCIES = host-pkgconf
 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))
index 033194a533763a9c02f747fce1e2616dd6c1c87f..9823416e3fd143a63e5eee923dab8993dca9ed30 100644 (file)
@@ -14,10 +14,4 @@ ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y)
 SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf
 endif
 
-define SYSPROF_CREATE_M4_DIR
-       mkdir -p $(@D)/m4
-endef
-
-SYSPROF_POST_PATCH_HOOKS += SYSPROF_CREATE_M4_DIR
-
 $(eval $(autotools-package))
index 4d2df5cb39798e948c1ae798b65d127e67569005..fc083c27f6f24b91e596dc3de749390681c60b71 100644 (file)
@@ -53,13 +53,6 @@ TESSERACT_OCR_EXTRA_DOWNLOADS = \
        $(addprefix https://github.com/tesseract-ocr/tessdata/raw/$(TESSERACT_OCR_DATA_VERSION)/,\
                $(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
 define TESSERACT_OCR_INSTALL_LANG_DATA
        $(foreach langfile,$(TESSERACT_OCR_DATA_FILES), \