From 2fceab73f111a9466a7fd30df5d4162e02788504 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 12 Nov 2014 01:25:51 +0100 Subject: [PATCH] pkg-autotools: remove redundant shell conditional The libtool patching function checks whether patching libtool is wanted before doing the actual patching. This is redundant now, as all callers are now protected by a conditional block. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Johan Oudinet Signed-off-by: Thomas Petazzoni --- package/pkg-autotools.mk | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 45947b0088..e240b95c1c 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -44,19 +44,17 @@ endef # define PATCH_LIBTOOL @$(call MESSAGE,"Patching libtool") - $(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES" ]; then \ - for i in `find $(1) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ - if test $${ltmain_version} = '1.5'; then \ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ - elif test $${ltmain_version} = "2.2"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ - elif test $${ltmain_version} = "2.4"; then\ - $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ - fi \ - done \ - fi + $(Q)for i in `find $(1) -name ltmain.sh`; do \ + ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$i | \ + sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ + if test $${ltmain_version} = '1.5'; then \ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ + elif test $${ltmain_version} = "2.2"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ + elif test $${ltmain_version} = "2.4"; then\ + $(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ + fi \ + done endef # This function generates the ac_cv_file_ value for a given -- 2.30.2