Changeset 19399


Ignore:
Timestamp:
2010-01-30T15:51:22+01:00 (6 years ago)
Author:
lars
Message:

autotools.mk: Add libstdc++ quirk to libtool_fixup_libdir.
Fixes build of packages which use libtool and link against packages which link against libstdc++

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/autotools.mk

    r16317 r19399  
    2323define libtool_fixup_libdir 
    2424        find $(1) -name '*.la' | $(XARGS) \ 
    25                 $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" 
     25                $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \ 
     26                    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g" 
    2627        find $(2) -name '*.la' | $(XARGS) \ 
    27                 $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" 
     28                $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" \ 
     29                    -e "s,$(STAGING_DIR)/usr/lib/\(libstdc++\|libsupc++\).la,$(TOOLCHAIN_DIR)/usr/lib/\1.la,g" 
    2830endef 
    2931 
Note: See TracChangeset for help on using the changeset viewer.