summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2014-09-03 00:00:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-22 12:04:22 (GMT)
commit93f7d098e569723230728a74a461c648452d463e (patch)
tree934d33a2d53681c7f4fdc54e6ed9b6772502916f /meta/recipes-connectivity
parenteb5572023142be9db72520d2d91db5e18d268705 (diff)
downloadpoky-93f7d098e569723230728a74a461c648452d463e.tar.gz
irda-utils: obey LDFLAGS
While we're at it, also switch to explicit variable passing rather than relying on make -e, and pass V=1 so the actual commands hit the logs. (From OE-Core rev: 7106f840b7d2a71171131c3c3e5fc311718ca718) Signed-off-by: Christopher Larson <chris_larson@mentor.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.patch75
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb18
2 files changed, 88 insertions, 5 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
new file mode 100644
index 0000000..2cdd1ac
--- /dev/null
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
@@ -0,0 +1,75 @@
1Obey LDFLAGS
2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4Upstream-status: Pending
5
6--- irda-utils-0.9.18.orig/findchip/Makefile
7+++ irda-utils-0.9.18/findchip/Makefile
8@@ -65,5 +65,5 @@ install: findchip
9
10 gfindchip: gfindchip.c
11 $(prn_cc)
12- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
13+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
14
15--- irda-utils-0.9.18.orig/irattach/Makefile
16+++ irda-utils-0.9.18/irattach/Makefile
17@@ -49,13 +49,13 @@ all: $(TARGETS)
18
19 irattach: irattach.o util.o
20 $(prn_cc_o)
21- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
22+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
23
24
25
26 dongle_attach: dongle_attach.o
27 $(prn_cc_o)
28- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
29+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
30
31
32 install: $(TARGETS)
33--- irda-utils-0.9.18.orig/irdadump/Makefile
34+++ irda-utils-0.9.18/irdadump/Makefile
35@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
36
37 irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
38 $(prn_cc_o)
39- $(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)
41
42
43 .c.o:
44--- irda-utils-0.9.18.orig/irdaping/Makefile
45+++ irda-utils-0.9.18/irdaping/Makefile
46@@ -56,7 +56,7 @@ all: $(TARGETS)
47
48 irdaping: $(OBJS)
49 $(prn_cc_o)
50- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
51+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
52
53
54 .c.o:
55--- irda-utils-0.9.18.orig/irnetd/Makefile
56+++ irda-utils-0.9.18/irnetd/Makefile
57@@ -50,7 +50,7 @@ all: $(TARGETS)
58
59 irnetd: $(OBJS)
60 $(prn_cc_o)
61- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
62+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
63
64
65 install: irnetd
66--- irda-utils-0.9.18.orig/psion/Makefile
67+++ irda-utils-0.9.18/psion/Makefile
68@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
69 CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
70 irpsion5:
71 $(prn_cc_o)
72- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
73\ No newline at end of file
74+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
75\ No newline at end of file
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
index 7403dc9..21891b2 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
+++ b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
@@ -12,21 +12,29 @@ LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
12 file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178" 12 file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
15 file://init" 15 file://ldflags.patch \
16 file://init"
16 17
17SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb" 18SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
18SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6" 19SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
19 20
20export SYS_INCLUDES="-I${STAGING_INCDIR}"
21
22inherit autotools-brokensep update-rc.d 21inherit autotools-brokensep update-rc.d
23 22
23EXTRA_OEMAKE = "\
24 'CC=${CC}' \
25 'LD=${LD}' \
26 'CFLAGS=${CFLAGS}' \
27 'LDFLAGS=${LDFLAGS}' \
28 'SYS_INCLUDES=' \
29 'V=1' \
30"
31
24INITSCRIPT_NAME = "irattach" 32INITSCRIPT_NAME = "irattach"
25INITSCRIPT_PARAMS = "defaults 20" 33INITSCRIPT_PARAMS = "defaults 20"
26 34
27do_compile () { 35do_compile () {
28 oe_runmake -e -C irattach 36 oe_runmake -C irattach
29 oe_runmake -e -C irdaping 37 oe_runmake -C irdaping
30} 38}
31 39
32do_install () { 40do_install () {