Commit 5eb23c9b authored by Danomi Manchego's avatar Danomi Manchego Committed by Peter Korsgaard
Browse files

pkg-autotools: fix whitespace regex in libtool patch hook 



The first sed line for ltmain_version attempts to match whitespace before
VERSION with [ space_character tab_character ]. The second sed line used to
make ltmain_patchlevel has only space characters in the whitespace expression,
possibly due to a smart editor automatically converting tabs to spaces. Make
these lines consistent with each other and more resilient against accidental
loss of tab characters by replacing the tabs with '\t'.

Signed-off-by: default avatarDanomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent f33f7668

package/pkg-autotools.mk

+2 −2
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ endef 
define LIBTOOL_PATCH_HOOK

	@$(call MESSAGE,"Patching libtool")

	$(Q)for i in `find $($(PKG)_SRCDIR) -name ltmain.sh`; do \

		ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$i | \

		ltmain_version=`sed -n '/^[ \t]*VERSION=/{s/^[ \t]*VERSION=//;p;q;}' $$i | \

		sed -e 's/\([0-9]*\.[0-9]*\).*/\1/' -e 's/\"//'`; \

		ltmain_patchlevel=`sed -n '/^[     ]*VERSION=/{s/^[        ]*VERSION=//;p;q;}' $$i | \

		ltmain_patchlevel=`sed -n '/^[ \t]*VERSION=/{s/^[ \t]*VERSION=//;p;q;}' $$i | \

		sed -e 's/\([0-9]*\.[0-9]*\.*\)\([0-9]*\).*/\2/' -e 's/\"//'`; \

		if test $${ltmain_version} = '1.5'; then \

			$(APPLY_PATCHES) $${i%/*} support/libtool buildroot-libtool-v1.5.patch; \