[Astlinux-commits] SF.net SVN: astlinux:[6974] branches/1.0/package/Makefile.autotools.in

[<abe...@us...>]

Revision: 6974
          http://sourceforge.net/p/astlinux/code/6974
Author:   abelbeck
Date:     2015-02-11 17:42:56 +0000 (Wed, 11 Feb 2015)
Log Message:
-----------
build system, fix patching libtool with a verson with a single 'dot' and eliminate errors like:
/bin/sh: line 0: test: 2.4: integer expression expected

Modified Paths:
--------------
    branches/1.0/package/Makefile.autotools.in

Modified: branches/1.0/package/Makefile.autotools.in
===================================================================
--- branches/1.0/package/Makefile.autotools.in	2015-02-11 16:39:52 UTC (rev 6973)
+++ branches/1.0/package/Makefile.autotools.in	2015-02-11 17:42:56 UTC (rev 6974)
@@ -150,10 +150,10 @@
 		-a "$$($$(PKG)_AUTORECONF)" != "YES"; then \
 		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/\"//'`; \
-			ltmain_patchlevel=`sed -n '/^[     ]*VERSION=/{s/^[        ]*VERSION=//;p;q;}' $$$$i | \
-			sed -e 's/\([0-9].[0-9].\)\([0-9]*\).*/\2/' -e 's/\"//'`; \
-			if test $$$${ltmain_version} = '1.5'; then \
+			sed -e 's/\([0-9][.][0-9][0-9]*\).*/\1/' -e 's/\"//'`; \
+			ltmain_patchlevel=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
+			sed -e 's/\([0-9][.][0-9][0-9]*[.]*\)\([0-9]*\).*/\2/' -e 's/\"//'`; \
+			if test $$$${ltmain_version} = "1.5"; then \
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
@@ -182,9 +182,9 @@
 	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		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/\"//'`; \
-			ltmain_patchlevel=`sed -n '/^[     ]*VERSION=/{s/^[        ]*VERSION=//;p;q;}' $$$$i | \
-			sed -e 's/\([0-9].[0-9].\)\([0-9]*\).*/\2/' -e 's/\"//'`; \
+			sed -e 's/\([0-9][.][0-9][0-9]*\).*/\1/' -e 's/\"//'`; \
+			ltmain_patchlevel=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
+			sed -e 's/\([0-9][.][0-9][0-9]*[.]*\)\([0-9]*\).*/\2/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = "1.5"; then \
 				toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.