speedo: Also try patch files w/o version number.
authorWerner Koch <wk@gnupg.org>
Wed, 4 May 2016 12:31:46 +0000 (14:31 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 4 May 2016 12:31:46 +0000 (14:31 +0200)
* build-aux/speedo.mk (SPKG_template): Try such a patch file.

Signed-off-by: Werner Koch <wk@gnupg.org>
build-aux/speedo.mk

index 2812773..d286655 100644 (file)
@@ -866,9 +866,13 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
                  | sed -e 's,\.tar.*$$$$,,'`;          \
           mv $$$${base} $(1);                          \
           patch="$(patdir)/$(1)-$$$${base#$(1)-}.patch";\
+          patchx="$(patdir)/$(1).patch";               \
           if [ -x "$$$${patch}" ]; then                \
              echo "speedo: applying patch $$$${patch}"; \
              cd $(1); "$$$${patch}";                   \
+          elif [ -x "$$$${patchx}" ]; then             \
+             echo "speedo: applying patch $$$${patchx}";\
+             cd $(1); "$$$${patchx}";                  \
           elif [ -f "$$$${patch}" ]; then              \
              echo "speedo: warning: $$$${patch} is not executable"; \
           fi;                                          \