- change autotools configure handling

make/environment-build.mk

@@ -269,23 +269,41 @@ TARGET_CONFIGURE_OPTS = \
 TARGET_CONFIGURE_OPTS += \
 	$($(PKG)_CONF_OPTS)
 
-HOST_CONFIGURE = \
+define AUTORECONF
+	$(Q)( \
 	if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \
 		$(call MESSAGE,"Autoreconfiguring"); \
-		$($(PKG)_AUTORECONF_ENV) autoreconf -fi $($(PKG)_AUTORECONF_OPTS); \
+		$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+			$($(PKG)_AUTORECONF_ENV) autoreconf -fi $($(PKG)_AUTORECONF_OPTS); \
 	fi; \
-	test -f ./configure || ./autogen.sh && \
+	)
-	CONFIG_SITE=/dev/null \
+endef
-	$(HOST_CONFIGURE_ENV) ./configure $(HOST_CONFIGURE_OPTS)
 
-TARGET_CONFIGURE = \
+define HOST_CONFIGURE
-	if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \
+	$(call AUTORECONF)
-		$(call MESSAGE,"Autoreconfiguring"); \
+	@$(call MESSAGE,"Configuring")
-		$($(PKG)_AUTORECONF_ENV) autoreconf -fi $($(PKG)_AUTORECONF_OPTS); \
+	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-	fi; \
+	$(Q)( \
-	test -f ./configure || ./autogen.sh && \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
-	CONFIG_SITE=/dev/null \
+		test -f ./configure || ./autogen.sh && \
-	$(TARGET_CONFIGURE_ENV) ./configure $(TARGET_CONFIGURE_OPTS)
+		CONFIG_SITE=/dev/null \
+		$(HOST_CONFIGURE_ENV) ./configure $(HOST_CONFIGURE_OPTS); \
+	)
+	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+endef
+
+define TARGET_CONFIGURE
+	$(call AUTORECONF)
+	@$(call MESSAGE,"Configuring")
+	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		test -f ./configure || ./autogen.sh && \
+		CONFIG_SITE=/dev/null \
+		$(TARGET_CONFIGURE_ENV) ./configure $(TARGET_CONFIGURE_OPTS); \
+	)
+	$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
+endef
 
 # -----------------------------------------------------------------------------
 
@@ -360,7 +378,7 @@ define HOST_CMAKE
 	@$(call MESSAGE,"Configuring")
 	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
 	$(Q)( \
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		rm -f CMakeCache.txt; \
 		$(HOST_CMAKE_ENV) cmake $(HOST_CMAKE_OPTS); \
 	)
@@ -371,7 +389,7 @@ define TARGET_CMAKE
 	@$(call MESSAGE,"Configuring")
 	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
 	$(Q)( \
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		rm -f CMakeCache.txt; \
 		$(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS); \
 	)

make/target-ffmpeg.mk

@@ -359,7 +359,7 @@ ffmpeg: $(FFMPEG_DEPENDENCIES) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
 ifneq ($($(PKG)_UNPATCHED),yes)
 	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
 endif
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		./configure $($(PKG)_CONF_OPTS); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)

package/autofs/autofs.mk

@@ -51,13 +51,17 @@ AUTOFS_CONF_OPTS = \
 AUTOFS_MAKE_ENV = \
 	DONTSTRIP=1
 
+define AUTOFS_PATCH_RPC_SUBS_H
+	$(SED) "s|nfs/nfs.h|linux/nfs.h|" $(PKG_BUILD_DIR)/include/rpc_subs.h
+endef
+AUTOFS_POST_PATCH_HOOKS += AUTOFS_PATCH_RPC_SUBS_H
+
 autofs: $(AUTOFS_DEPENDENCIES) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
 	$(UNTAR)/$(PKG_SOURCE)
 	$(call APPLY_PATCHES,$($(PKG)_PATCH))
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$(PKG_DIR); \
-		$(SED) "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \
-		$(TARGET_CONFIGURE); \
 		$($(PKG)_MAKE_ENV) \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)

package/dropbear/dropbear.mk

@@ -32,8 +32,8 @@ DROPBEAR_TARGET_FINALIZE_HOOKS += DROPBEAR_INSTALL_INIT_SCRIPT
 
 dropbear: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		$(TARGET_CONFIGURE); \
 		# Ensure that dropbear doesn't use crypt() when it's not available; \
 		echo '#if !HAVE_CRYPT'				>> localoptions.h; \
 		echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0'	>> localoptions.h; \

package/e2fsprogs/e2fsprogs.mk

@@ -59,8 +59,8 @@ E2FSPROGS_TARGET_FINALIZE_HOOKS += E2FSPROGS_TARGET_CLEANUP
 
 e2fsprogs: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		$(TARGET_CONFIGURE); \
 		$(MAKE); \
 		$(MAKE1) install install-libs DESTDIR=$(TARGET_DIR)
 	$(call TARGET_FOLLOWUP)

package/freetype/freetype.mk

@@ -33,7 +33,7 @@ define FREETYPE_EXECUTE_AUTOTOOLS
 		aclocal -I .; \
 		autoconf
 endef
-FREETYPE_POST_PATCH_HOOKS += FREETYPE_EXECUTE_AUTOTOOLS
+FREETYPE_PRE_CONFIGURE_HOOKS += FREETYPE_EXECUTE_AUTOTOOLS
 
 define FREETYPE_LINK_FREETYPE
 	ln -sf freetype2 $(TARGET_includedir)/freetype

package/gettext/gettext.mk

@@ -29,8 +29,8 @@ GETTEXT_CONF_OPTS = \
 gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
 	$(UNTAR)/$(PKG_SOURCE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$(PKG_DIR); \
-		$(TARGET_CONFIGURE); \
 		$(MAKE) -C gettext-runtime; \
 		$(MAKE) -C gettext-runtime install DESTDIR=$(TARGET_DIR)
 	$(REWRITE_LIBTOOL)

package/lcd4linux/lcd4linux.mk

@@ -30,11 +30,16 @@ define LCD4LINUX_INSTALL_SKEL
 endef
 LCD4LINUX_TARGET_FINALIZE_HOOKS += LCD4LINUX_INSTALL_SKEL
 
+define LCD4LINUX_BOOTSTRAP
+	$(CHDIR)/$($(PKG)_DIR); \
+		./bootstrap
+endef
+LCD4LINUX_PRE_CONFIGURE_HOOKS += LCD4LINUX_BOOTSTRAP
+
 lcd4linux: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		./bootstrap; \
-		$(TARGET_CONFIGURE); \
 		$(MAKE) vcs_version; \
 		$(MAKE); \
 		$(MAKE) install

package/libaacs/libaacs.mk

@@ -25,7 +25,7 @@ define LIBAACS_BOOTSTRAP
 	$(CHDIR)/$($(PKG)_DIR); \
 		./bootstrap
 endef
-LIBAACS_POST_PATCH_HOOKS += LIBAACS_BOOTSTRAP
+LIBAACS_PRE_CONFIGURE_HOOKS += LIBAACS_BOOTSTRAP
 
 define LIBAACS_INSTALL_FILES
 	$(INSTALL) -d $(TARGET_DIR)/.cache/aacs/vuk

package/libbdplus/libbdplus.mk

@@ -19,7 +19,7 @@ define LIBBDPLUS_BOOTSTRAP
 	$(CHDIR)/$($(PKG)_DIR); \
 		./bootstrap
 endef
-LIBBDPLUS_POST_PATCH_HOOKS += LIBBDPLUS_BOOTSTRAP
+LIBBDPLUS_PRE_CONFIGURE_HOOKS += LIBBDPLUS_BOOTSTRAP
 
 define LIBBDPLUS_INSTALL_FILES
 	$(INSTALL) -d $(TARGET_DIR)/.config/bdplus/vm0

package/libbluray/libbluray.mk

@@ -28,7 +28,7 @@ define LIBBLURAY_BOOTSTRAP
 	$(CHDIR)/$($(PKG)_DIR); \
 		./bootstrap
 endef
-LIBBLURAY_POST_PATCH_HOOKS += LIBBLURAY_BOOTSTRAP
+LIBBLURAY_PRE_CONFIGURE_HOOKS += LIBBLURAY_BOOTSTRAP
 
 libbluray: | $(TARGET_DIR)
 	$(call autotools-package)

package/links/links.mk

@@ -49,7 +49,7 @@ define LINKS_PREPARE_INTL
 	$(CHDIR)/$($(PKG)_DIR)/intl; \
 		./gen-intl
 endef
-LINKS_POST_PATCH_HOOKS += LINKS_PREPARE_INTL
+LINKS_PRE_CONFIGURE_HOOKS += LINKS_PREPARE_INTL
 
 define LINKS_INSTALL_AS_NEUTRINO_PLUGIN
 	$(INSTALL) -d $(SHARE_PLUGINS)

package/luaposix/luaposix.mk

@@ -36,12 +36,12 @@ define LUAPOSIX_BOOTSTRAP
 	$(CHDIR)/$($(PKG)_DIR); \
 		./bootstrap
 endef
-LUAPOSIX_POST_PATCH_HOOKS += LUAPOSIX_BOOTSTRAP
+LUAPOSIX_PRE_CONFIGURE_HOOKS += LUAPOSIX_BOOTSTRAP
 
 luaposix: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		$(TARGET_CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install
 	$(call TARGET_FOLLOWUP)

package/minisatip/minisatip.mk

@@ -39,8 +39,8 @@ MINISATIP_TARGET_FINALIZE_HOOKS += MINISATIP_INSTALL_INIT_SCRIPT
 
 minisatip: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		$(TARGET_CONFIGURE); \
 		$(TARGET_CONFIGURE_ENV) \
 		$(MAKE)
 	$(call TARGET_FOLLOWUP)

package/nano/nano.mk

@@ -37,8 +37,8 @@ NANO_TARGET_FINALIZE_HOOKS += NANO_INSTALL_PROFILE_D_SCRIPT
 
 nano: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		$(TARGET_CONFIGURE); \
 		$(NANO_MAKE_ENV) $(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(call TARGET_FOLLOWUP)

package/pkg-autotools.mk

@@ -6,8 +6,8 @@
 
 define autotools-package
 	$(call PREPARE)
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(call TARGET_CONFIGURE)
-		$(TARGET_CONFIGURE); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(call TARGET_FOLLOWUP)
@@ -15,8 +15,8 @@ endef
 
 define host-autotools-package
 	$(call PREPARE)
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(call HOST_CONFIGURE)
-		$(HOST_CONFIGURE); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		$(MAKE); \
 		$(MAKE) install
 	$(call HOST_FOLLOWUP)

package/pkg-cmake.mk

@@ -7,7 +7,7 @@
 define cmake-package
 	$(call PREPARE)
 	$(call TARGET_CMAKE)
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(TARGET_RM) $(TARGET_libdir)/cmake
@@ -17,7 +17,7 @@ endef
 define host-cmake-package
 	$(call PREPARE)
 	$(call HOST_CMAKE)
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		$(MAKE); \
 		$(MAKE) install
 	$(call HOST_FOLLOWUP)

package/pkg-python.mk

@@ -30,7 +30,7 @@ HOST_PYTHON3_INSTALL = \
 
 define host-python3-package
 	$(call PREPARE)
-	$(CHDIR)/$($(PKG)_DIR); \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
 		$(HOST_PYTHON3_BUILD); \
 		$(HOST_PYTHON3_INSTALL)
 	$(call HOST_FOLLOWUP)

package/pkg-utils.mk

@@ -9,14 +9,14 @@ pkgname = $(basename $(@F))
 pkg = $(call LOWERCASE,$(pkgname))
 PKG = $(call UPPERCASE,$(pkgname))
 
-PKG_BUILD_DIR = $(BUILD_DIR)/$($(PKG)_DIR)
+PKG_BUILD_DIR = $(BUILD_DIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR)
 PKG_FILES_DIR = $(PACKAGE_DIR)/$(subst host-,,$(pkgname))/files
 PKG_PATCHES_DIR = $(PACKAGE_DIR)/$(subst host-,,$(pkgname))/patches
 
 # -----------------------------------------------------------------------------
 
 # Compatibility variables (marked to remove)
-PKG_DIR         = $($(PKG)_DIR)
+PKG_DIR         = $($(PKG)_DIR)/$($(PKG)_SUBDIR)
 PKG_SOURCE      = $($(PKG)_SOURCE)
 PKG_SITE        = $($(PKG)_SITE)
 PKG_PATCH       = $($(PKG)_PATCH)

package/samba33/samba33.mk

@@ -9,8 +9,7 @@ SAMBA33_DIR = samba-$(SAMBA33_VERSION)
 SAMBA33_SOURCE = samba-$(SAMBA33_VERSION).tar.gz
 SAMBA33_SITE = https://download.samba.org/pub/samba
 
-$(DL_DIR)/$(SAMBA33_SOURCE):
+SAMBA33_SUBDIR = source
-	$(download) $(SAMBA33_SITE)/$(SAMBA33_SOURCE)
 
 SAMBA33_DEPENDENCIES = zlib
 
@@ -52,13 +51,18 @@ SAMBA33_CONF_OPTS = \
 	--disable-relro \
 	--disable-swat
 
-samba33: $(SAMBA33_DEPENDENCIES) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
+define SAMBA33_AUTOGEN_SH
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		./autogen.sh
+endef
+SAMBA33_PRE_CONFIGURE_HOOKS += SAMBA33_AUTOGEN_SH
+
+samba33: | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
 	$(UNTAR)/$(PKG_SOURCE)
 	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
-	$(CHDIR)/$(PKG_DIR)/source; \
+	$(call TARGET_CONFIGURE)
-		./autogen.sh; \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
-		$(TARGET_CONFIGURE); \
 		$(MAKE1) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(INSTALL) -d $(TARGET_localstatedir)/samba/locks

package/samba36/samba36.mk

@@ -9,8 +9,7 @@ SAMBA36_DIR = samba-$(SAMBA36_VERSION)
 SAMBA36_SOURCE = samba-$(SAMBA36_VERSION).tar.gz
 SAMBA36_SITE = https://download.samba.org/pub/samba/stable
 
-$(DL_DIR)/$(SAMBA36_SOURCE):
+SAMBA36_SUBDIR = source3
-	$(download) $(SAMBA36_SITE)/$(SAMBA36_SOURCE)
 
 SAMBA36_DEPENDENCIES = zlib
 
@@ -50,13 +49,18 @@ SAMBA36_CONF_OPTS = \
 	--disable-relro \
 	--disable-swat \
 
+define SAMBA36_AUTOGEN_SH
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		./autogen.sh
+endef
+SAMBA36_PRE_CONFIGURE_HOOKS += SAMBA36_AUTOGEN_SH
+
 samba36: $(SAMBA36_DEPENDENCIES) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
 	$(UNTAR)/$(PKG_SOURCE)
 	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
-	$(CHDIR)/$(PKG_DIR)/source3; \
+	$(call TARGET_CONFIGURE)
-		./autogen.sh; \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
-		$(TARGET_CONFIGURE); \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(INSTALL) -d $(TARGET_localstatedir)/samba/locks

package/streamripper/streamripper.mk

@@ -35,7 +35,7 @@ STREAMRIPPER_TARGET_FINALIZE_HOOKS += STREAMRIPPER_INSTALL_SCRIPT
 
 streamripper: | $(TARGET_DIR)
 	$(call PREPARE)
+	$(call TARGET_CONFIGURE)
 	$(CHDIR)/$($(PKG)_DIR); \
-		$(TARGET_CONFIGURE); \
 		$(MAKE)
 	$(call TARGET_FOLLOWUP)