aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2010-12-04 00:11:09 +0000
committerMirko Vogt <mirko@openwrt.org>2010-12-04 00:11:09 +0000
commit06878dba1740a0a396d143bedd596c75aeaf4fc7 (patch)
tree1871a8566b493f6acddd4da438ba7e9fb23c1a63
parent92deed35b80bc9185b8c28d33fe03bcaf370109a (diff)
downloadupstream-06878dba1740a0a396d143bedd596c75aeaf4fc7.tar.gz
upstream-06878dba1740a0a396d143bedd596c75aeaf4fc7.tar.bz2
upstream-06878dba1740a0a396d143bedd596c75aeaf4fc7.zip
[trunk/include/autotools.mk] disable libtool fixups in trunk globally
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24234 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/autotools.mk27
1 files changed, 14 insertions, 13 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index 1ddb49b7d4..7e251ead53 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -49,17 +49,18 @@ define remove_version_check
fi
endef
-ifneq ($(filter libtool,$(PKG_FIXUP)),)
- PKG_BUILD_DEPENDS += libtool
- Hooks/Configure/Pre += update_libtool remove_version_check
- Hooks/Configure/Post += update_libtool
- Hooks/InstallDev/Post += libtool_fixup_libdir
-endif
-
-ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
- PKG_BUILD_DEPENDS += libtool
- Hooks/Configure/Pre += update_libtool_ucxx remove_version_check
- Hooks/Configure/Post += update_libtool_ucxx
- Hooks/InstallDev/Post += libtool_fixup_libdir
-endif
+# XXX the libtool fixups got deactivated in the course of switching to libtool2 in trunk XXX
+# ifneq ($(filter libtool,$(PKG_FIXUP)),)
+# PKG_BUILD_DEPENDS += libtool
+# Hooks/Configure/Pre += update_libtool remove_version_check
+# Hooks/Configure/Post += update_libtool
+# Hooks/InstallDev/Post += libtool_fixup_libdir
+# endif
+#
+# ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
+# PKG_BUILD_DEPENDS += libtool
+# Hooks/Configure/Pre += update_libtool_ucxx remove_version_check
+# Hooks/Configure/Post += update_libtool_ucxx
+# Hooks/InstallDev/Post += libtool_fixup_libdir
+# endif