[oe-commits] Stephen Simpson : libdvb 0.5.5.1: Fix build on GCC 4.x

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0c84ce234bb065fe646b79f26a8f789fd7d14d16
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0c84ce234bb065fe646b79f26a8f789fd7d14d16

Author: Stephen Simpson <stephen at quaddro.net>
Date:   Sun Nov 29 16:02:22 2009 +0000

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

---

 recipes/libdvb/files/gcc4.patch    |   11 +++++++++++
 recipes/libdvb/files/ldflags.patch |   27 +++++++++++++++++++++++++++
 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 0000000..280c2ea
--- /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 0000000..70a7ea6
--- /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 d2db2ce..e982c1f 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
 }