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>
This commit is contained in:
parent
eb55720231
commit
93f7d098e5
|
@ -0,0 +1,75 @@
|
|||
Obey LDFLAGS
|
||||
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
Upstream-status: Pending
|
||||
|
||||
--- irda-utils-0.9.18.orig/findchip/Makefile
|
||||
+++ irda-utils-0.9.18/findchip/Makefile
|
||||
@@ -65,5 +65,5 @@ install: findchip
|
||||
|
||||
gfindchip: gfindchip.c
|
||||
$(prn_cc)
|
||||
- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
|
||||
|
||||
--- irda-utils-0.9.18.orig/irattach/Makefile
|
||||
+++ irda-utils-0.9.18/irattach/Makefile
|
||||
@@ -49,13 +49,13 @@ all: $(TARGETS)
|
||||
|
||||
irattach: irattach.o util.o
|
||||
$(prn_cc_o)
|
||||
- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
|
||||
|
||||
|
||||
|
||||
dongle_attach: dongle_attach.o
|
||||
$(prn_cc_o)
|
||||
- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
|
||||
|
||||
|
||||
install: $(TARGETS)
|
||||
--- irda-utils-0.9.18.orig/irdadump/Makefile
|
||||
+++ irda-utils-0.9.18/irdadump/Makefile
|
||||
@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
|
||||
|
||||
irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
|
||||
$(prn_cc_o)
|
||||
- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
|
||||
|
||||
|
||||
.c.o:
|
||||
--- irda-utils-0.9.18.orig/irdaping/Makefile
|
||||
+++ irda-utils-0.9.18/irdaping/Makefile
|
||||
@@ -56,7 +56,7 @@ all: $(TARGETS)
|
||||
|
||||
irdaping: $(OBJS)
|
||||
$(prn_cc_o)
|
||||
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
|
||||
|
||||
|
||||
.c.o:
|
||||
--- irda-utils-0.9.18.orig/irnetd/Makefile
|
||||
+++ irda-utils-0.9.18/irnetd/Makefile
|
||||
@@ -50,7 +50,7 @@ all: $(TARGETS)
|
||||
|
||||
irnetd: $(OBJS)
|
||||
$(prn_cc_o)
|
||||
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
|
||||
|
||||
|
||||
install: irnetd
|
||||
--- irda-utils-0.9.18.orig/psion/Makefile
|
||||
+++ irda-utils-0.9.18/psion/Makefile
|
||||
@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
|
||||
CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
|
||||
irpsion5:
|
||||
$(prn_cc_o)
|
||||
- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
|
||||
\ No newline at end of file
|
||||
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
|
||||
\ No newline at end of file
|
|
@ -12,21 +12,29 @@ LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
|
|||
file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
|
||||
file://init"
|
||||
file://ldflags.patch \
|
||||
file://init"
|
||||
|
||||
SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
|
||||
SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
|
||||
|
||||
export SYS_INCLUDES="-I${STAGING_INCDIR}"
|
||||
|
||||
inherit autotools-brokensep update-rc.d
|
||||
|
||||
EXTRA_OEMAKE = "\
|
||||
'CC=${CC}' \
|
||||
'LD=${LD}' \
|
||||
'CFLAGS=${CFLAGS}' \
|
||||
'LDFLAGS=${LDFLAGS}' \
|
||||
'SYS_INCLUDES=' \
|
||||
'V=1' \
|
||||
"
|
||||
|
||||
INITSCRIPT_NAME = "irattach"
|
||||
INITSCRIPT_PARAMS = "defaults 20"
|
||||
|
||||
do_compile () {
|
||||
oe_runmake -e -C irattach
|
||||
oe_runmake -e -C irdaping
|
||||
oe_runmake -C irattach
|
||||
oe_runmake -C irdaping
|
||||
}
|
||||
|
||||
do_install () {
|
||||
|
|
Loading…
Reference in New Issue