summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-03 09:52:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:59 +0100
commita23a7794f85d5678f59c7e62d1a74dbfbfd32edd (patch)
tree4d8d8a0425a26b90a1546b653300acee51e46ba9
parent133bff2ac26d9dbd6fe9c98bc4360ac10351fe9d (diff)
downloadpoky-a23a7794f85d5678f59c7e62d1a74dbfbfd32edd.tar.gz
lrzsz: fix build with automake 1.12
(From OE-Core rev: 42d77fa2b90998d6a19e7a99d36c429e6faa5934) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch49
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb6
2 files changed, 53 insertions, 2 deletions
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..b4529f4c7a
--- /dev/null
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
@@ -0,0 +1,49 @@
1Upstream-Status: Pending
2
3This patch fixes following issue with automake 1.12
4
5| configure.in:95: error: automatic de-ANSI-fication support has been removed
6...
7| lib/Makefile.am:3: error: automatic de-ANSI-fication support has been removed
8| lib/Makefile.am: installing './depcomp'
9| src/Makefile.am:11: error: automatic de-ANSI-fication support has been removed
10
11
12Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
132012/05/03
14
15Index: lrzsz-0.12.20/configure.in
16===================================================================
17--- lrzsz-0.12.20.orig/configure.in
18+++ lrzsz-0.12.20/configure.in
19@@ -92,7 +92,6 @@ AC_PROG_RANLIB
20 AC_ISC_POSIX
21 AC_AIX
22 AC_MINIX
23-AM_C_PROTOTYPES
24 AC_C_CONST
25 AC_C_INLINE
26
27Index: lrzsz-0.12.20/lib/Makefile.am
28===================================================================
29--- lrzsz-0.12.20.orig/lib/Makefile.am
30+++ lrzsz-0.12.20/lib/Makefile.am
31@@ -1,6 +1,5 @@
32 noinst_LIBRARIES=libzmodem.a
33 CFLAGS=@CFLAGS@
34-AUTOMAKE_OPTIONS=ansi2knr
35
36 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
37 getopt.c getopt1.c mkdir.c mktime.c \
38Index: lrzsz-0.12.20/src/Makefile.am
39===================================================================
40--- lrzsz-0.12.20.orig/src/Makefile.am
41+++ lrzsz-0.12.20/src/Makefile.am
42@@ -8,7 +8,6 @@ CFLAGS=@CFLAGS@
43 DISTCLEAN_FILES=lrzszbug
44
45 LDADD = ../lib/libzmodem.a @LIBINTL@
46-AUTOMAKE_OPTIONS=ansi2knr
47 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
48 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
49 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 7f861575ec..e76f36a144 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -10,12 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
10 file://src/lrz.c;beginline=1;endline=10;md5=5276956373ff7d8758837f6399a1045f" 10 file://src/lrz.c;beginline=1;endline=10;md5=5276956373ff7d8758837f6399a1045f"
11SECTION = "console/network" 11SECTION = "console/network"
12DEPENDS = "" 12DEPENDS = ""
13PR = "r4" 13PR = "r5"
14 14
15SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \ 15SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
16 file://autotools.patch \ 16 file://autotools.patch \
17 file://makefile.patch \ 17 file://makefile.patch \
18 file://gettext.patch" 18 file://gettext.patch \
19 file://lrzsz_fix_for_automake-1.12.patch \
20 "
19 21
20SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4" 22SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
21SRC_URI[sha256sum] = "c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1" 23SRC_URI[sha256sum] = "c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1"