build: move the SH_FUNC eval to the beginning of the opkg control file build command...

[openwrt.git] / include / autotools.mk

diff --git a/include/autotools.mk b/include/autotools.mk
index 308b45a..7797031 100644 (file)
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -21,7 +21,9 @@ AM_TOOL_PATHS:= \
        ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
        AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
        LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
        ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
        AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
        LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \

-       M4=$(STAGING_DIR_HOST)/bin/m4
+       LIBTOOL=$(STAGING_DIR_HOST)/bin/libtool \
+       M4=$(STAGING_DIR_HOST)/bin/m4 \
+       AUTOPOINT=true

 
 # 1: build dir
 # 2: remove files
 
 # 1: build dir
 # 2: remove files


@@ -32,15 +34,15 @@ define autoreconf
        (cd $(1); \
                $(patsubst %,rm -f %;,$(2)) \
                $(foreach p,$(3), \
        (cd $(1); \
                $(patsubst %,rm -f %;,$(2)) \
                $(foreach p,$(3), \

-                       if [ -x $(p)/autogen.sh ]; then \
-                               $(AM_TOOL_PATHS) $(p)/autogen.sh || true; \
-                       elif [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
-                               [ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
+                       if [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \

                                [ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
                                [ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \

+                               touch NEWS AUTHORS COPYING ChangeLog; \

                                $(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
                                        -B $(STAGING_DIR_HOST)/share/aclocal \
                                $(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
                                        -B $(STAGING_DIR_HOST)/share/aclocal \

-                                       $(patsubst %,-B %,$(5)) \
+                                       $(patsubst %,-I %,$(5)) \

                                        $(patsubst %,-I %,$(4)) $(4) || true; \
                                        $(patsubst %,-I %,$(4)) $(4) || true; \

+                               [ -e $(p)/config.rpath ] || \
+                                               ln -s $(SCRIPT_DIR)/config.rpath $(p)/config.rpath;

                        fi; \
                ) \
        );
                        fi; \
                ) \
        );


@@ -49,6 +51,7 @@ endef
 
 PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
 PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)
 
 PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH)
 PKG_AUTOMAKE_PATHS?=$(CONFIGURE_PATH)

+PKG_MACRO_PATHS?=m4

 PKG_REMOVE_FILES?=aclocal.m4
 
 Hooks/InstallDev/Post += libtool_remove_files
 PKG_REMOVE_FILES?=aclocal.m4
 
 Hooks/InstallDev/Post += libtool_remove_files


@@ -57,18 +60,18 @@ define autoreconf_target
   $(strip $(call autoreconf, \
     $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
     $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
   $(strip $(call autoreconf, \
     $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
     $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \

-    $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal))
+    $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))

 endef
 
 ifneq ($(filter libtool,$(PKG_FIXUP)),)
 endef
 
 ifneq ($(filter libtool,$(PKG_FIXUP)),)

-  PKG_BUILD_DEPENDS += libtool
+  PKG_BUILD_DEPENDS += libtool libintl libiconv

  ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
   Hooks/Configure/Pre += autoreconf_target
  endif
 endif
 
 ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
  ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
   Hooks/Configure/Pre += autoreconf_target
  endif
 endif
 
 ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)

-  PKG_BUILD_DEPENDS += libtool
+  PKG_BUILD_DEPENDS += libtool libintl libiconv

  ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
   Hooks/Configure/Pre += autoreconf_target
  endif
  ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
   Hooks/Configure/Pre += autoreconf_target
  endif


@@ -84,23 +87,23 @@ endif
 HOST_FIXUP?=$(PKG_FIXUP)
 HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)
 HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.)
 HOST_FIXUP?=$(PKG_FIXUP)
 HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)
 HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.)

+HOST_MACRO_PATHS?=$(if $(PKG_MACRO_PATHS),$(PKG_MACRO_PATHS),m4)

 HOST_REMOVE_FILES?=$(PKG_REMOVE_FILES)
 
 define autoreconf_host
   $(strip $(call autoreconf, \
     $(HOST_BUILD_DIR), $(HOST_REMOVE_FILES), \
 HOST_REMOVE_FILES?=$(PKG_REMOVE_FILES)
 
 define autoreconf_host
   $(strip $(call autoreconf, \
     $(HOST_BUILD_DIR), $(HOST_REMOVE_FILES), \

-    $(HOST_AUTOMAKE_PATHS), $(HOST_LIBTOOL_PATHS)))
+    $(HOST_AUTOMAKE_PATHS), $(HOST_LIBTOOL_PATHS), \
+    $(HOST_MACRO_PATHS)))

 endef
 
 ifneq ($(filter libtool,$(HOST_FIXUP)),)
 endef
 
 ifneq ($(filter libtool,$(HOST_FIXUP)),)

-  HOST_BUILD_DEPENDS += libtool

  ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
   Hooks/HostConfigure/Pre += autoreconf_host
  endif
 endif
 
 ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)
  ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
   Hooks/HostConfigure/Pre += autoreconf_host
  endif
 endif
 
 ifneq ($(filter libtool-ucxx,$(HOST_FIXUP)),)

-  HOST_BUILD_DEPENDS += libtool

  ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
   Hooks/HostConfigure/Pre += autoreconf_host
  endif
  ifeq ($(filter no-autoreconf,$(HOST_FIXUP)),)
   Hooks/HostConfigure/Pre += autoreconf_host
  endif