[PATCH 0/2] Fixes for 1.4 Milestone 5

[PATCH 0/2] Fixes for 1.4 Milestone 5

[Saul Wold]

Richard,

Here are a couple of fixes to address build and critical issues
with Milestone 5.  

Thanks
	Sau!


Alexandru DAMIAN (1):
  grep: Always use locale.h

Saul Wold (1):
  alsa-tools: add patch for mips since it does not have io.h

 .../grep/grep-2.5.1a/fix64-int-to-pointer.patch         | 17 +++++++++++++++++
 meta/recipes-extended/grep/grep_2.5.1a.bb               |  1 +
 .../alsa/alsa-tools/mips_has_no_io_h.patch              | 13 +++++++++++++
 meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb     |  1 +
 4 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
 create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch

-- 
1.8.0.2

[PATCH 1/2] grep: Always use locale.h

[Saul Wold]

From: Alexandru DAMIAN <alexandru.damian@intel.com>

The changes in the grep 2.5 configuration always leave out
HAVE_LOCALE_H - it has been removed from other files, but
not from everywhere.

This leads to a crash in certain configurations where the
size of int is not the size of pointer; this happens because
setlocale() is used while being undeclared.

[YOCTO #3959]

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../grep/grep-2.5.1a/fix64-int-to-pointer.patch         | 17 +++++++++++++++++
 meta/recipes-extended/grep/grep_2.5.1a.bb               |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch

diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch b/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
new file mode 100644
index 0000000..3b91520
--- /dev/null
+++ b/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch
@@ -0,0 +1,17 @@
+Always use locale.h as HAVE_LOCALE_H is no longer handled by ./configure
+Upstream-Status: Inappropriate [ old version that will not be maintained ]
+Signed-off-by: Alex DAMIAN <alexandru.damian@intel.com>
+
+diff --recursive --unified grep-2.5.1a-orig/lib/hard-locale.c grep-2.5.1a/lib/hard-locale.c
+--- grep-2.5.1a-orig/lib/hard-locale.c	2001-03-04 07:33:12.000000000 +0200
++++ grep-2.5.1a/lib/hard-locale.c	2013-03-11 17:05:52.086444891 +0200
+@@ -38,9 +38,7 @@
+ # endif
+ #endif
+ 
+-#if HAVE_LOCALE_H
+ # include <locale.h>
+-#endif
+ 
+ #if HAVE_STRING_H
+ # include <string.h>
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index ebcbe23..d6386ed 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
            file://uclibc-fix.patch \
            file://grep_fix_for_automake-1.12.patch \
            file://gettext.patch \
+           file://fix64-int-to-pointer.patch \
            file://Makevars \
            "
 
-- 
1.8.0.2

[PATCH 2/2] alsa-tools: add patch for mips since it does not have io.h

[Saul Wold]

[YOCTO #4051]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../alsa/alsa-tools/mips_has_no_io_h.patch                  | 13 +++++++++++++
 meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb         |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch

diff --git a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
new file mode 100644
index 0000000..7083cb2
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
@@ -0,0 +1,13 @@
+Index: alsa-tools-1.0.26.1/hda-verb/hda-verb.c
+===================================================================
+--- alsa-tools-1.0.26.1.orig/hda-verb/hda-verb.c
++++ alsa-tools-1.0.26.1/hda-verb/hda-verb.c
+@@ -13,7 +13,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+-#ifndef __PPC__
++#if __PPC__ || __MIPS__
+ #include <sys/io.h>
+ #endif
+ #include <sys/types.h>
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
index 0fe4bee..2b46aaf 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
                     file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
+           file://mips_has_no_io_h.patch \
            file://autotools.patch"
 
 SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230"
-- 
1.8.0.2