diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-11 21:50:50 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-11 21:50:50 +0000 |
| commit | 17abd54667a0ce81002999e43fb54970980e6514 (patch) | |
| tree | 9ce8632009a9871cd6d6b7ccf80da2e575a372dd | |
| parent | 16ab0dfd80858f2be995dadb03ffd9f7b02c65f8 (diff) | |
| download | upstream-17abd54667a0ce81002999e43fb54970980e6514.tar.gz upstream-17abd54667a0ce81002999e43fb54970980e6514.tar.bz2 upstream-17abd54667a0ce81002999e43fb54970980e6514.zip | |
[include] autotools.mk: cope with Debian version strings in libtool
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32207 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/autotools.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index c5ba748ab9..8796598569 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -51,9 +51,9 @@ endef # 1: build dir define patch_libtool - (cd $(1); \ + @(cd $(1); \ for lt in $$$$($$(STAGING_DIR_HOST)/bin/find . -name ltmain.sh); do \ - lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION=\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \ + lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION="\?\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \ case "$$$$lt_version" in \ 1.5|2.2|2.4) echo "autotools.mk: Found libtool v$$$$lt_version - applying patch to $$$$lt"; \ (cd $$$$(dirname $$$$lt) && $$(PATCH) -N -s -p1 < $$(TOPDIR)/tools/libtool/files/libtool-v$$$$lt_version.patch || true) ;; \ |