Mercurial > mxe-octave
changeset 721:bc69ccf2503c
use explicitly "patch -u" to avoid warnings about guessing the patch type
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Thu, 11 Feb 2010 09:17:28 +0100 |
parents | a22a99b45c2e |
children | dc0a01dbbcd6 |
files | Makefile src/gcc.mk |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Feb 09 11:32:46 2010 +0100 +++ b/Makefile Thu Feb 11 09:17:28 2010 +0100 @@ -140,7 +140,7 @@ cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1)) cd '$(2)/$($(1)_SUBDIR)' $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)), - (cd '$(2)/$($(1)_SUBDIR)' && patch -p1) < $(PKG_PATCH)) + (cd '$(2)/$($(1)_SUBDIR)' && patch -p1 -u) < $(PKG_PATCH)) $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) rm -rfv '$(2)' ,)
--- a/src/gcc.mk Tue Feb 09 11:32:46 2010 +0100 +++ b/src/gcc.mk Thu Feb 11 09:17:28 2010 +0100 @@ -42,7 +42,7 @@ cd '$(1)' && \ for p in '$(1)'/gcc-tdm/*.patch; do \ $(SED) 's,\r$$,,' -i "$$p" || exit 1; \ - patch -p1 < "$$p" || exit 1; \ + patch -p1 -u < "$$p" || exit 1; \ done # unpack support libraries cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-gmp)