X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e4c6bd13192fd179bd808d36bbbd3462a8b029e0..99a212a2565ed4c256d86645d14ff7064f284f2d:/include/autotools.mk?ds=sidebyside diff --git a/include/autotools.mk b/include/autotools.mk index c941a4949..d5f1e464c 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -5,61 +5,50 @@ # See /LICENSE for more information. # -define replace - if [ -f "$(PKG_BUILD_DIR)/$(3)$(1)" -a -e "$(2)/$(if $(4),$(4),$(1))" ]; then \ - rm -f $(PKG_BUILD_DIR)/$(3)$(1); \ - ln -s $(2)/$(if $(4),$(4),$(1)) $(PKG_BUILD_DIR)/$(3)$(1); \ - fi - -endef - PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH) - -# replace copies of ltmain.sh with the build system's version -update_libtool_common = \ - $(foreach p,$(LIBTOOL_PATHS), \ - $(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(p)/) \ - $(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(p)/) \ - ) -update_libtool = \ - $(foreach p,$(PKG_LIBTOOL_PATHS), \ - $(call replace,libtool,$(STAGING_DIR)/host/bin,$(p)/) \ - ) \ - $(call update_libtool_common) -update_libtool_ucxx = \ - $(foreach p,$(PKG_LIBTOOL_PATHS), \ - $(call replace,libtool,$(STAGING_DIR)/host/bin,$(p)/,libtool-ucxx) \ - ) \ - $(call update_libtool_common) +PKG_REMOVE_FILES?=aclocal.m4 autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2)) -# prevent libtool from linking against host development libraries -define libtool_fixup_libdir - find $(1) -name '*.la' | $(XARGS) \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \ - -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g" +# delete *.la-files from staging_dir - we can not yet remove respective lines within all package +# Makefiles, since backfire still uses libtool v1.5.x which (may) require those files +define libtool_remove_files + find $(1) -name '*.la' | $(XARGS) rm -f; endef -define remove_version_check - if [ -f "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure" ]; then \ - $(SED) \ - 's,\(gentoo\|pardus\)_ltmain_version=.*,\1_ltmain_version="$$$$\1_lt_version",' \ - $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \ - fi +define autoreconf + (cd $(PKG_BUILD_DIR); \ + $(patsubst %,rm -f %;,$(PKG_REMOVE_FILES)) \ + if [ -x ./autogen.sh ]; then \ + ./autogen.sh || true; \ + elif [ -f ./configure.ac ] || [ -f ./configure.in ]; then \ + [ -f ./aclocal.m4 ] && [ ! -f ./acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \ + [ -d ./autom4te.cache ] && rm -rf autom4te.cache; \ + $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \ + -B $(STAGING_DIR)/host/share/aclocal \ + $(patsubst %,-I %,$(PKG_LIBTOOL_PATHS)) $(PKG_LIBTOOL_PATHS) || true; \ + fi \ + ); endef +Hooks/InstallDev/Post += libtool_remove_files + ifneq ($(filter libtool,$(PKG_FIXUP)),) PKG_BUILD_DEPENDS += libtool - Hooks/Configure/Pre += update_libtool remove_version_check - Hooks/Configure/Post += update_libtool - Hooks/InstallDev/Post += libtool_fixup_libdir + ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) + Hooks/Configure/Pre += autoreconf + endif endif - + ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),) PKG_BUILD_DEPENDS += libtool - Hooks/Configure/Pre += update_libtool_ucxx remove_version_check - Hooks/Configure/Post += update_libtool_ucxx - Hooks/InstallDev/Post += libtool_fixup_libdir + ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) + Hooks/Configure/Pre += autoreconf + endif endif +ifneq ($(filter autoreconf,$(PKG_FIXUP)),) + ifeq ($(filter autoreconf,$(Hooks/Configure/Pre)),) + Hooks/Configure/Pre += autoreconf + endif +endif