summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:56:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:01 -0700
commit3c02fc2788ab4a78f0aef129d8a73855fb2fd784 (patch)
treedfa0b0beae1152b840ddc6e3a54f93310d592dd5 /meta
parent3f93bc693286dd6e102da12dd76bd57c79852f28 (diff)
downloadpoky-3c02fc2788ab4a78f0aef129d8a73855fb2fd784.tar.gz
newt: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 8820d4ffa493d49212f4d8f2665d15c7070a7477) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/newt/files/cross_ar.patch26
1 files changed, 12 insertions, 14 deletions
diff --git a/meta/recipes-extended/newt/files/cross_ar.patch b/meta/recipes-extended/newt/files/cross_ar.patch
index 03007aa4f4..86cc0be1d3 100644
--- a/meta/recipes-extended/newt/files/cross_ar.patch
+++ b/meta/recipes-extended/newt/files/cross_ar.patch
@@ -18,18 +18,19 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18 configure.ac | 4 ++++ 18 configure.ac | 4 ++++
19 2 files changed, 6 insertions(+), 1 deletion(-) 19 2 files changed, 6 insertions(+), 1 deletion(-)
20 20
21diff --git a/Makefile.in b/Makefile.in 21Index: newt-0.52.20/Makefile.in
22--- a/Makefile.in 22===================================================================
23+++ b/Makefile.in 23--- newt-0.52.20.orig/Makefile.in
24+++ newt-0.52.20/Makefile.in
24@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ 25@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
25 LDFLAGS = @LDFLAGS@ 26 LDFLAGS = @LDFLAGS@
26 CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ 27 CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
27 GNU_LD = @GNU_LD@ 28 GNU_LD = @GNU_LD@
28+AR = @AR@ 29+AR = @AR@
29 30
30 VERSION = @VERSION@ 31 VERSION = @VERSION@
31 TAG = r$(subst .,-,$(VERSION)) 32 TAG = r$(subst .,-,$(VERSION))
32@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH) 33@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE
33 $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) 34 $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS)
34 35
35 $(LIBNEWT): $(LIBOBJS) 36 $(LIBNEWT): $(LIBOBJS)
@@ -38,10 +39,10 @@ diff --git a/Makefile.in b/Makefile.in
38 39
39 newt.o $(SHAREDDIR)/newt.o: newt.c Makefile 40 newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
40 41
41diff --git a/configure.ac b/configure.ac 42Index: newt-0.52.20/configure.ac
42index 92e6da8..cd83d57 100644 43===================================================================
43--- a/configure.ac 44--- newt-0.52.20.orig/configure.ac
44+++ b/configure.ac 45+++ newt-0.52.20/configure.ac
45@@ -15,6 +15,10 @@ AC_PROG_INSTALL 46@@ -15,6 +15,10 @@ AC_PROG_INSTALL
46 AC_PROG_LN_S 47 AC_PROG_LN_S
47 AC_PROG_GREP 48 AC_PROG_GREP
@@ -51,8 +52,5 @@ index 92e6da8..cd83d57 100644
51+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) 52+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
52+AC_PROG_AR 53+AC_PROG_AR
53 54
54 # Are we using GNU ld? 55 AC_CHECK_SIZEOF([long])
55 AC_MSG_CHECKING([for GNU ld]) 56 AC_CHECK_SIZEOF([long long])
56--
571.8.1.2
58