Skip to contentSkip to conversation

lrzsz: check locale.h in configure

PATCH In review [email protected] 2 participants 4 messages May 29, 2013 – May 30, 2013

lore
Share & tools
lore
#0 lore raw

cover lrzsz: check locale.h in configure

From: Jackie Huang <[email protected]>

fix the build failure when using -O0 in debug build:
lrz.c:284:13: error: 'LC_ALL' undeclared (first use in this function)

tested with:
MACHINE=qemux86-64/qemuarm/qemuppc
DEBUG_BUILD = "1"
DEBUG_OPTIMIZATION = "-O0 -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"

$ bitbake lrzsz
$ bitbake core-image-sato

--
The following changes since commit 8f5bc47729edb8cb051d81e9ff1680cb8d2eca25:

dropbear: a fix for hang in dropbearkey, built for x32 (2013-05-24 14:14:30 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib jhuang0/d_lrzsz_0529_2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_lrzsz_0529_2

Jackie Huang (1):
lrzsz: check locale.h in configure

 .../lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch |   26 ++++++++++++++++++++
 meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb            |    3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 lrzsz: check locale.h in configure

From: Jackie Huang <[email protected]>

fix the build failure when using -O0 in debug build:
lrz.c:284:13: error: 'LC_ALL' undeclared (first use in this function)

---
 .../lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch |   26 ++++++++++++++++++++
 meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb            |    3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +26 -0
new file mode 100644
index 0000000..d628a5a
@@ -0,0 +1,26 @@
+From 28b473c3c96682a820e292cc1be006e19aee11bc Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+Date: Fri, 24 May 2013 01:07:24 -0400
+Subject: [PATCH] lrzsz check locale.h
+
+Signed-off-by: Jackie Huang <[email protected]>
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6e2064c..c10460c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -130,7 +130,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h sys/times.h)
+ LRZSZ_HEADERS_TERM_IO
+ AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
+ AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h)
+-AC_CHECK_HEADERS(sys/select.h strings.h arpa/inet.h)
++AC_CHECK_HEADERS(sys/select.h strings.h locale.h arpa/inet.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
+--
+1.7.9.5
+
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +2 -1
index 83a75e3..38ce493 100644
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 			file://src/lrz.c;beginline=1;endline=10;md5=5276956373ff7d8758837f6399a1045f"
 SECTION = "console/network"
 DEPENDS = ""
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
 	   file://autotools.patch \
 	   file://makefile.patch \
 	   file://gettext.patch \
 	   file://lrzsz_fix_for_automake-1.12.patch \
+	   file://lrzsz-check-locale.h.patch \
            "
 
 SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 18 lines · On 05/29/2013 05:27 PM, [email protected] wrote:

From: Jackie Huang <[email protected]>

fix the build failure when using -O0 in debug build:
lrz.c:284:13: error: 'LC_ALL' undeclared (first use in this function)

---
  .../lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch |   26 ++++++++++++++++++++
  meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb            |    3 ++-
  2 files changed, 28 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +0 -0
new file mode 100644
index 0000000..d628a5a

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch line 5

Quoted 5 lines
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +5 -0
@@ -0,0 +1,26 @@
+From 28b473c3c96682a820e292cc1be006e19aee11bc Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+Date: Fri, 24 May 2013 01:07:24 -0400
+Subject: [PATCH] lrzsz check locale.h
+

What about an Upstream-Status: Tag??

This looks like a resonable patch to submit upstream also, please do so.

Thanks
Sau!

Quoted 42 lines
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +21 -0
+Signed-off-by: Jackie Huang <[email protected]>
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6e2064c..c10460c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -130,7 +130,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h sys/times.h)
+ LRZSZ_HEADERS_TERM_IO
+ AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
+ AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h)
+-AC_CHECK_HEADERS(sys/select.h strings.h arpa/inet.h)
++AC_CHECK_HEADERS(sys/select.h strings.h locale.h arpa/inet.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
+--
+1.7.9.5
+
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +2 -1
index 83a75e3..38ce493 100644
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
  			file://src/lrz.c;beginline=1;endline=10;md5=5276956373ff7d8758837f6399a1045f"
  SECTION = "console/network"
  DEPENDS = ""
-PR = "r5"
+PR = "r6"
 
  SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
  	   file://autotools.patch \
  	   file://makefile.patch \
  	   file://gettext.patch \
  	   file://lrzsz_fix_for_automake-1.12.patch \
+	   file://lrzsz-check-locale.h.patch \
             "
 
  SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
author
#3 lore raw
Quoted 15 lines · Saul Wold
Quoted 14 lines · On 05/29/2013 05:27 PM, [email protected] wrote:

From: Jackie Huang <[email protected]>

fix the build failure when using -O0 in debug build:
lrz.c:284:13: error: 'LC_ALL' undeclared (first use in this function)

---
  .../lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch |   26
++++++++++++++++++++
  meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb            |    3 ++-
  2 files changed, 28 insertions(+), 1 deletion(-)

create mode 100644
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch

Quoted 14 lines

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch line 5

Quoted 13 lines

diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file mode 100644
index 0000000..d628a5a

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +5 -0
@@ -0,0 +1,26 @@
+From 28b473c3c96682a820e292cc1be006e19aee11bc Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+Date: Fri, 24 May 2013 01:07:24 -0400
+Subject: [PATCH] lrzsz check locale.h
+

What about an Upstream-Status: Tag??

Upstream-Status: Submitted [[email protected]]

Do I need to re-send the patch here?

Thanks,
Jackie

Quoted 55 lines

This looks like a resonable patch to submit upstream also, please do so.

Thanks
Sau!

Quoted 47 lines
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +10 -0
+Signed-off-by: Jackie Huang <[email protected]>
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6e2064c..c10460c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -130,7 +130,7 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h

sys/time.h unistd.h sys/times.h)
+ LRZSZ_HEADERS_TERM_IO
+ AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
+ AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h) +-AC_CHECK_HEADERS(sys/select.h strings.h arpa/inet.h) ++AC_CHECK_HEADERS(sys/select.h strings.h locale.h arpa/inet.h)

meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch new file +6 -0
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
+--
+1.7.9.5
+
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +0 -0
index 83a75e3..38ce493 100644
@@ -10,13 +10,14 @@ LIC_FILES_CHKSUM =
 "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 

file://src/lrz.c;beginline=1;endline=10;md5=5276956373ff7d8758837f6399a1045f"

SECTION = "console/network"
DEPENDS = ""

meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb +2 -1
-PR = "r5"
+PR = "r6"
 
  SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
         file://autotools.patch \
         file://makefile.patch \
         file://gettext.patch \
         file://lrzsz_fix_for_automake-1.12.patch \
+       file://lrzsz-check-locale.h.patch \
             "
 
  SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
Signature · 5 lines
Jackie Huang
WIND RIVER | China Development Center
MSN:[email protected]
Tel: +86 8477 8594
Mobile: +86 138 1027 4745