diff options
| author |   Stephen Simpson <stephen@quaddro.net> | 2009-11-29 16:02:22 +0000 |
|---|---|---|
| committer |   Henning Heinold <heinold@inf.fu-berlin.de> | 2009-11-30 23:51:06 +0100 |
| commit | 0c84ce234bb065fe646b79f26a8f789fd7d14d16 (patch) | |
| tree | 00a3c8c05b980519d62eeb97e313f82e592fa6a6 /recipes/libdvb | |
| parent | 73ec71fa4554390dde8366a620d82ad288db85b7 (diff) | |
| download | openembedded-0c84ce234bb065fe646b79f26a8f789fd7d14d16.tar.gz | |
libdvb 0.5.5.1: Fix build on GCC 4.x
* sample_progs/cam_menu.hh was missing #include <cstring>, does not error on gcc < 4.x
* dvb-mpegtools/Makefile did not pass LDFLAGS when necessary for linking, causing QA Issues
Recipe changes:
* Change recipe to remove CFLAGS from config.mk to allow the CFLAGS variable passed to be used instead
* Add patches to recipe
Diffstat (limited to 'recipes/libdvb')
| -rw-r--r-- | recipes/libdvb/files/gcc4.patch | 11 | ||||
| -rw-r--r-- | recipes/libdvb/files/ldflags.patch | 27 | ||||
| -rw-r--r-- | recipes/libdvb/libdvb_0.5.5.1.bb | 6 |
3 files changed, 42 insertions, 2 deletions
diff --git a/recipes/libdvb/files/gcc4.patch b/recipes/libdvb/files/gcc4.patch new file mode 100644 index 0000000000..280c2eaafa --- /dev/null +++ b/recipes/libdvb/files/gcc4.patch @@ -0,0 +1,11 @@ +diff -urN libdvb-0.5.5.1/sample_progs/cam_menu.hh libdvb-0.5.5.1-superterrific/sample_progs/cam_menu.hh +--- libdvb-0.5.5.1/sample_progs/cam_menu.hh 2005-03-22 08:23:25.000000000 -0500 ++++ libdvb-0.5.5.1-superterrific/sample_progs/cam_menu.hh 2009-11-29 19:34:44.000000000 -0500 +@@ -4,6 +4,7 @@ + */ + #include <sys/types.h> + #include <sys/socket.h> ++#include <cstring> + + #ifndef __CAM_MENU_HH + #define __CAM_MENU_HH diff --git a/recipes/libdvb/files/ldflags.patch b/recipes/libdvb/files/ldflags.patch new file mode 100644 index 0000000000..70a7ea6acb --- /dev/null +++ b/recipes/libdvb/files/ldflags.patch @@ -0,0 +1,27 @@ +diff -urN libdvb-0.5.5.1/dvb-mpegtools/Makefile libdvb-0.5.5.1-superterrific/dvb-mpegtools/Makefile +--- libdvb-0.5.5.1/dvb-mpegtools/Makefile 2009-11-29 19:40:06.000000000 -0500 ++++ libdvb-0.5.5.1-superterrific/dvb-mpegtools/Makefile 2009-11-29 19:40:21.000000000 -0500 +@@ -33,19 +33,19 @@ + dvbaudio + + dvb-mpegtools_main: main.o +- $(CXX) main.o $(LIBS) -o $@ ++ $(CXX) main.o $(LDFLAGS) $(LIBS) -o $@ + + ctest: mainc.o + $(CC) $(COBJ) -o $@ + + dvb-mplex: $(MPLEXOBS) +- $(CXX) $(MPLEXOBS) $(LIBS) -o $@ ++ $(CXX) $(MPLEXOBS) $(LDFLAGS) $(LIBS) -o $@ + + dvbaudio: dvbaudio.o +- $(CXX) dvbaudio.o $(LIBS) -ldvb -o $@ ++ $(CXX) dvbaudio.o $(LDFLAGS) $(LIBS) -ldvb -o $@ + + audiofilter: audiofilter.o +- $(CXX) audiofilter.o -o $@ ++ $(CXX) audiofilter.o $(LDFLAGS) -o $@ + + %.o: %.cc + $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $< diff --git a/recipes/libdvb/libdvb_0.5.5.1.bb b/recipes/libdvb/libdvb_0.5.5.1.bb index d2db2ce0d6..e982c1f58e 100644 --- a/recipes/libdvb/libdvb_0.5.5.1.bb +++ b/recipes/libdvb/libdvb_0.5.5.1.bb @@ -7,7 +7,9 @@ LICENSE = "GPL" PR = "r3" SRC_URI = "http://www.metzlerbros.org/dvb/${P}.tar.gz \ - file://topf2ps.patch;patch=1" + file://topf2ps.patch;patch=1 \ + file://gcc4.patch;patch=1 \ + file://ldflags.patch;patch=1" S = "${WORKDIR}/${PN}-${PV}" @@ -16,7 +18,7 @@ PARALLEL_MAKE = "" inherit autotools pkgconfig do_configure() { - grep -v ^PREFIX ${S}/config.mk > ${S}/config.mk.new + grep -v ^PREFIX ${S}/config.mk | grep -v ^CFLAGS > ${S}/config.mk.new echo "PREFIX=${prefix}" >> ${S}/config.mk.new mv ${S}/config.mk.new ${S}/config.mk } |