[PATCH 0/3] dvb-apps: Buildroot patches

[PATCH 0/3] dvb-apps: Buildroot patches

[Romain Naour]

This series contains several patches for dvb-apps to fixes
some cross-compilation/toolchain issues and add the ability
to disable static/shared libraries.

Arnout Vandecappelle (Essensium/Mind) (1):
  Fix generate-keynames.sh script for cross-compilation

Romain Naour (1):
  Make.rules: Handle static/shared only build

Simon Dawson (1):
  When building for avr32, the build fails as follows.

 Make.rules                                | 8 +++++++-
 util/av7110_loadkeys/generate-keynames.sh | 4 ++--
 util/scan/Makefile                        | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

-- 
1.9.3

[PATCH 1/3] Fix generate-keynames.sh script for cross-compilation

[Romain Naour]

From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>

generate-keynames.sh reads /usr/include/linux to find the keyname
symbols. However, when cross-compiling, the include path points
somewhere else. Allow the user to pass CROSS_ROOT to point to the
root of the cross-compilation environment.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 util/av7110_loadkeys/generate-keynames.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/av7110_loadkeys/generate-keynames.sh b/util/av7110_loadkeys/generate-keynames.sh
index 49d2b71..cb8f5c5 100644
--- a/util/av7110_loadkeys/generate-keynames.sh
+++ b/util/av7110_loadkeys/generate-keynames.sh
@@ -18,7 +18,7 @@ echo "};" >> $1
 echo >> $1
 echo >> $1
 echo "static struct input_key_name key_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
            egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \
            cut -f 1 | cut -f 2 -d " " | sort -u) ; do
     echo "        { \"$(echo $x | cut -b 5-)\", $x }," >> $1
@@ -26,7 +26,7 @@ done
 echo "};" >> $1
 echo >> $1
 echo "static struct input_key_name btn_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
            egrep "#define[ \t]+BTN_" | \
            cut -f 1 | cut -f 2 -d " " | sort -u) ; do
      echo "        { \"$(echo $x | cut -b 5-)\", $x }," >> $1
-- 
1.9.3

[PATCH 2/3] When building for avr32, the build fails as follows.

[Romain Naour]

From: Simon Dawson <spdawson@gmail.com>

  cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat"

An example of an autobuild failure arising from this is the following.

  http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/

Clearly, not all toolchains provide a gcc that understands
the -Wno-packed-bitfield-compat flag; remove usage of this flag.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 util/scan/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/scan/Makefile b/util/scan/Makefile
index d48c478..88667c5 100644
--- a/util/scan/Makefile
+++ b/util/scan/Makefile
@@ -14,7 +14,7 @@ inst_bin = $(binaries)
 
 removing = atsc_psip_section.c atsc_psip_section.h
 
-CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES
+CPPFLAGS += -D__KERNEL_STRICT_NAMES
 
 .PHONY: all
 
-- 
1.9.3

[PATCH 3/3] Make.rules: Handle static/shared only build

[Romain Naour]

Do not build .a library when disable_static is set
Do not build .so library when disable_shared is set

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 Make.rules | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Make.rules b/Make.rules
index 3410d7b..4add272 100644
--- a/Make.rules
+++ b/Make.rules
@@ -9,7 +9,13 @@ ifneq ($(lib_name),)
 CFLAGS_LIB ?= -fPIC
 CFLAGS += $(CFLAGS_LIB)
 
-libraries = $(lib_name).so $(lib_name).a
+ifeq ($(disable_static),)
+libraries = $(lib_name).a
+endif
+
+ifeq ($(disable_shared),)
+libraries += $(lib_name).so
+endif
 
 .PHONY: library
 
-- 
1.9.3