Commit b3b2222f authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

pkg-autotools: fold the libtool patching code directly into the hook 



We now have only one caller of the libtool patching code, which is the
hook itself.

So, there is no longer any need to extract this code into a utility
function, and it can be folded into the hook itself.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Johan Oudinet <johan.oudinet@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 2fceab73

package/pkg-autotools.mk

+12 −22
Original line number Diff line number Diff line
@@ -36,27 +36,6 @@ define CONFIG_UPDATE 
	done

endef



#

# Utility function to patch the libtool files

#

# argument 1 : directory into which to search for libtool scripts to patch.

# Note that libtool scripts are searched for recursively in this directory

#

define PATCH_LIBTOOL

	@$(call MESSAGE,"Patching libtool")

	$(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_<foo> value for a given

# filename. This is needed to convince configure script doing

# AC_CHECK_FILE() tests that the file actually exists, since such
@@ -79,7 +58,18 @@ endef 
# Hook to patch libtool to make it work properly for cross-compilation

#

define LIBTOOL_PATCH_HOOK

	$(call PATCH_LIBTOOL,$($(PKG)_SRCDIR))

	@$(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 | \

		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



#