summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-08 02:24:21 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-08 02:24:21 +0000
commite419e3e062024fbcf05480b27b6cdaac440816d9 (patch)
treee7a8c9be65bf7777295a8ad87391a6cd84cfa383 /include
parent92fc3a6d97cc4c47e1d1982b2c2a1bab95477069 (diff)
[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.mk13
1 files changed, 4 insertions, 9 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index df5e85a5f..9ba3fc33b 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