Changeset 24321


Ignore:
Timestamp:
2010-12-08T03:24:21+01:00 (7 years ago)
Author:
jow
Message:

[include] autotools.mk: allow disabling autoreconf, remove libdir fixup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/autotools.mk

    r24320 r24321  
    99 
    1010autoconf_bool = $(patsubst %,$(if $($(1)),--enable,--disable)-%,$(2)) 
    11  
    12 # prevent libtool from linking against host development libraries 
    13 define libtool_fixup_libdir 
    14         find $(1) -name '*.la' | $(XARGS) \ 
    15                 $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \ 
    16                     -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/lib/\1.la,g"; 
    17 endef 
    1811 
    1912# delete *.la-files from staging_dir - we can not yet remove respective lines within all package 
     
    3831ifneq ($(filter libtool,$(PKG_FIXUP)),) 
    3932  PKG_BUILD_DEPENDS += libtool 
     33 ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) 
    4034  Hooks/Configure/Pre += autoreconf 
    41   Hooks/InstallDev/Post += libtool_fixup_libdir 
     35 endif 
    4236endif 
    4337  
    4438ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),) 
    4539  PKG_BUILD_DEPENDS += libtool 
     40 ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) 
    4641  Hooks/Configure/Pre += autoreconf 
    47   Hooks/InstallDev/Post += libtool_fixup_libdir 
     42 endif 
    4843endif 
    4944 
Note: See TracChangeset for help on using the changeset viewer.