From: Lars-Peter Clausen Date: Sat, 30 Jan 2010 14:51:22 +0000 (+0000) Subject: autotools.mk: Add libstdc++ quirk to libtool_fixup_libdir. Fixes build of packages... X-Git-Tag: reboot~21233 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93567fed7afcb645f32dd2a0b42ea8e027475800;p=openwrt%2Fstaging%2Fpepe2k.git autotools.mk: Add libstdc++ quirk to libtool_fixup_libdir. Fixes build of packages which use libtool and link against packages which link against libstdc++ SVN-Revision: 19399 --- diff --git a/include/autotools.mk b/include/autotools.mk index 5d51d7a328..cd333577c1 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -22,9 +22,11 @@ update_libtool_ucxx=$(call replace,libtool,$(STAGING_DIR)/host/bin,$(CONFIGURE_P # 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" + $(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" find $(2) -name '*.la' | $(XARGS) \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" + $(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" endef define remove_version_check