diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-08 02:24:21 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-12-08 02:24:21 +0000 |
| commit | e989746744adde07cdfe60d4fabf45b855832990 (patch) | |
| tree | e7a8c9be65bf7777295a8ad87391a6cd84cfa383 /include | |
| parent | 5b6a0bc9483981647ed204ed4f95a5b565794b23 (diff) | |
| download | upstream-e989746744adde07cdfe60d4fabf45b855832990.tar.gz upstream-e989746744adde07cdfe60d4fabf45b855832990.tar.bz2 upstream-e989746744adde07cdfe60d4fabf45b855832990.zip | |
[include] autotools.mk: allow disabling autoreconf, remove libdir fixup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24321 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/autotools.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index df5e85a5f5..9ba3fc33b9 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -9,13 +9,6 @@ PKG_LIBTOOL_PATHS?=$(CONFIGURE_PATH) 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)/lib/\1.la,g"; -endef - # 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 @@ -37,13 +30,15 @@ Hooks/InstallDev/Post += libtool_remove_files ifneq ($(filter libtool,$(PKG_FIXUP)),) PKG_BUILD_DEPENDS += libtool + ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) Hooks/Configure/Pre += autoreconf - Hooks/InstallDev/Post += libtool_fixup_libdir + endif endif ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),) PKG_BUILD_DEPENDS += libtool + ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) Hooks/Configure/Pre += autoreconf - Hooks/InstallDev/Post += libtool_fixup_libdir + endif endif |