summaryrefslogtreecommitdiff
path: root/tools/quilt/patches/100-patch_2.6.1_version.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-02 12:53:32 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-02 12:53:32 +0000
commitac6cfcb956860f0ce396bfd2029e367b541343e1 (patch)
tree8583efd32a04a0ac8f322de76e72f00f0b3d50ac /tools/quilt/patches/100-patch_2.6.1_version.patch
parent4c6cfc925c234a4f385b198ce406122db93ca1be (diff)
[PATCH] quilt: fix building with dash
`test x == x` gives a syntax error with dash (standard in Debian). The modified patch reflects the current upstream: http://git.savannah.gnu.org/cgit/quilt.git/commit/?id=38df0b210c3df67f3e784af92232ae1946b98ecd git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/quilt/patches/100-patch_2.6.1_version.patch')
-rw-r--r--tools/quilt/patches/100-patch_2.6.1_version.patch8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/quilt/patches/100-patch_2.6.1_version.patch b/tools/quilt/patches/100-patch_2.6.1_version.patch
index 84f275318c..1e9ed75df1 100644
--- a/tools/quilt/patches/100-patch_2.6.1_version.patch
+++ b/tools/quilt/patches/100-patch_2.6.1_version.patch
@@ -1,11 +1,15 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -274,7 +274,7 @@ fi
+@@ -274,7 +274,11 @@ fi
AC_MSG_CHECKING([the version of $PATCH])
if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
set -- `$PATCH --version 2> /dev/null`
- patch_version=$2
-+ test $2 == "patch" && patch_version=$3 || patch_version=$2
++ if test x$1 = xGNU ; then
++ patch_version=$3
++ else
++ patch_version=$2
++ fi
AC_MSG_RESULT($patch_version)
saved_IFS=$IFS; IFS='.'
set -- $patch_version