Selaa lähdekoodia

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

SVN-Revision: 26804
Jo-Philipp Wich 15 vuotta sitten
vanhempi
sitoutus
8324bf036c
1 muutettua tiedostoa jossa 6 lisäystä ja 2 poistoa
  1. 6 2
      tools/quilt/patches/100-patch_2.6.1_version.patch

+ 6 - 2
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