Ignore:
Timestamp:
2007-12-27T03:11:11+01:00 (9 years ago)
Author:
nbd
Message:

fix libtool version checks in some configure scripts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/autotools.mk

    r9942 r9943  
    1515 
    1616# replace copies of ltmain.sh with the build system's version 
    17 update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/) 
     17update_libtool=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_PATH)/)$(call replace,ltmain.sh,$(STAGING_DIR)/host/share/libtool,$(CONFIGURE_PATH)/)$(call replace,libtool.m4,$(STAGING_DIR)/host/share/aclocal,$(CONFIGURE_PATH)/) 
    1818 
    1919# prevent libtool from linking against host development libraries 
    2020define libtool_fixup_libdir 
    2121        find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \ 
    22                 $(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g" 
     22                $(SED) "s,^libdir='/usr/lib',libdir='$(if $(PKG_INSTALL_DIR),$(PKG_INSTALL_DIR),$(STAGING_DIR))/usr/lib',g" 
     23endef 
     24 
     25define remove_version_check 
     26        if [ -f "$(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure" ]; then \ 
     27                $(SED) \ 
     28                        's,pardus_ltmain_version=.*,pardus_ltmain_version="$$$$pardus_lt_version",' \ 
     29                        $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/configure; \ 
     30        fi 
    2331endef 
    2432 
    2533ifneq ($(filter libtool,$(PKG_FIXUP)),) 
    2634  PKG_BUILD_DEPENDS += libtool 
    27   Hooks/Configure/Pre += update_libtool 
     35  Hooks/Configure/Pre += update_libtool remove_version_check 
    2836  Hooks/Configure/Post += update_libtool 
    29   Hooks/Build/Post += libtool_fixup_libdir 
     37  Hooks/Compile/Post += libtool_fixup_libdir 
    3038endif 
Note: See TracChangeset for help on using the changeset viewer.