summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:18:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:04 -0800
commitd1d088db2879f1fefeebda0da815c1138fa52256 (patch)
tree3999aa53601e98d1d9498065418e594d211cb750 /meta/recipes-connectivity
parentd71a037bc4c1de99d53f533f0a7137426573bc6e (diff)
downloadpoky-d1d088db2879f1fefeebda0da815c1138fa52256.tar.gz
irda-utils: 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: a3221aa92fa4423da3b70b8d673cf68be08ad922) 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/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch64
1 files changed, 38 insertions, 26 deletions
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
index e95fe35f8f..b246de8f5f 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
@@ -3,72 +3,84 @@ Obey LDFLAGS
3Signed-off-by: Christopher Larson <chris_larson@mentor.com> 3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4Upstream-Status: Pending 4Upstream-Status: Pending
5 5
6Index: irda-utils-0.9.18/findchip/Makefile
7===================================================================
6--- irda-utils-0.9.18.orig/findchip/Makefile 8--- irda-utils-0.9.18.orig/findchip/Makefile
7+++ irda-utils-0.9.18/findchip/Makefile 9+++ irda-utils-0.9.18/findchip/Makefile
8@@ -65,5 +65,5 @@ install: findchip 10@@ -65,5 +65,5 @@ install: findchip
9 11
10 gfindchip: gfindchip.c 12 gfindchip: gfindchip.c
11 $(prn_cc) 13 $(prn_cc)
12- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` 14- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
13+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs` 15+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
14 16
17Index: irda-utils-0.9.18/irattach/Makefile
18===================================================================
15--- irda-utils-0.9.18.orig/irattach/Makefile 19--- irda-utils-0.9.18.orig/irattach/Makefile
16+++ irda-utils-0.9.18/irattach/Makefile 20+++ irda-utils-0.9.18/irattach/Makefile
17@@ -49,13 +49,13 @@ all: $(TARGETS) 21@@ -49,13 +49,13 @@ all: $(TARGETS)
18 22
19 irattach: irattach.o util.o 23 irattach: irattach.o util.o
20 $(prn_cc_o) 24 $(prn_cc_o)
21- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ 25- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
22+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@ 26+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
23 27
24 28
25 29
26 dongle_attach: dongle_attach.o 30 dongle_attach: dongle_attach.o
27 $(prn_cc_o) 31 $(prn_cc_o)
28- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ 32- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
29+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@ 33+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
30 34
31 35
32 install: $(TARGETS) 36 install: $(TARGETS)
37Index: irda-utils-0.9.18/irdadump/Makefile
38===================================================================
33--- irda-utils-0.9.18.orig/irdadump/Makefile 39--- irda-utils-0.9.18.orig/irdadump/Makefile
34+++ irda-utils-0.9.18/irdadump/Makefile 40+++ irda-utils-0.9.18/irdadump/Makefile
35@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS) 41@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
36 42
37 irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET) 43 irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
38 $(prn_cc_o) 44 $(prn_cc_o)
39- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) 45- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
40+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) 46+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
41 47
42 48
43 .c.o: 49 .c.o:
50Index: irda-utils-0.9.18/irdaping/Makefile
51===================================================================
44--- irda-utils-0.9.18.orig/irdaping/Makefile 52--- irda-utils-0.9.18.orig/irdaping/Makefile
45+++ irda-utils-0.9.18/irdaping/Makefile 53+++ irda-utils-0.9.18/irdaping/Makefile
46@@ -56,7 +56,7 @@ all: $(TARGETS) 54@@ -56,7 +56,7 @@ all: $(TARGETS)
47 55
48 irdaping: $(OBJS) 56 irdaping: $(OBJS)
49 $(prn_cc_o) 57 $(prn_cc_o)
50- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ 58- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
51+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ 59+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
52 60
53 61
54 .c.o: 62 .c.o:
63Index: irda-utils-0.9.18/irnetd/Makefile
64===================================================================
55--- irda-utils-0.9.18.orig/irnetd/Makefile 65--- irda-utils-0.9.18.orig/irnetd/Makefile
56+++ irda-utils-0.9.18/irnetd/Makefile 66+++ irda-utils-0.9.18/irnetd/Makefile
57@@ -50,7 +50,7 @@ all: $(TARGETS) 67@@ -50,7 +50,7 @@ all: $(TARGETS)
58 68
59 irnetd: $(OBJS) 69 irnetd: $(OBJS)
60 $(prn_cc_o) 70 $(prn_cc_o)
61- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ 71- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
62+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ 72+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
63 73
64 74
65 install: irnetd 75 install: irnetd
76Index: irda-utils-0.9.18/psion/Makefile
77===================================================================
66--- irda-utils-0.9.18.orig/psion/Makefile 78--- irda-utils-0.9.18.orig/psion/Makefile
67+++ irda-utils-0.9.18/psion/Makefile 79+++ irda-utils-0.9.18/psion/Makefile
68@@ -25,4 +25,4 @@ install: $(PSION_TARGETS) 80@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
69 CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) 81 CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
70 irpsion5: 82 irpsion5:
71 $(prn_cc_o) 83 $(prn_cc_o)
72- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ 84- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
73\ No newline at end of file 85\ No newline at end of file
74+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@ 86+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@