Browse Source

disable libtool fixups in trunk globally

SVN-Revision: 24234
Mirko Vogt 15 years ago
parent
commit
b599f7dc42
1 changed files with 14 additions and 13 deletions
  1. 14 13
      include/autotools.mk

+ 14 - 13
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