mirror of
https://git.yoctoproject.org/poky
synced 2026-06-05 14:29:48 +00:00
lrzsz: Update autotools infrastructure and make it work with new gettext
Run gettextize and autoreconf and fix up the resulting problem so that it builds more-or-less cleanly and "make dist" works. Some of the existing patches that contained particular point fixes are now rolled into a single big patch. (From OE-Core rev: b045f83519807d645a22f74c590c037a4ebc4fbe) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e05e4b5b4b
commit
9115345734
@@ -1,19 +0,0 @@
|
||||
Add a description to the AC_DEFINE for LOCALEDIR so that it appears in config.h
|
||||
and silences a fatal warning.
|
||||
|
||||
Upstream-Status:Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index c10460c..aa20263 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -258,7 +258,7 @@ AC_SUBST(LIBS)
|
||||
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
|
||||
+AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[locale directory])
|
||||
|
||||
AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile m4/Makefile \
|
||||
man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,49 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
This patch fixes following issue with automake 1.12
|
||||
|
||||
| configure.in:95: error: automatic de-ANSI-fication support has been removed
|
||||
...
|
||||
| lib/Makefile.am:3: error: automatic de-ANSI-fication support has been removed
|
||||
| lib/Makefile.am: installing './depcomp'
|
||||
| src/Makefile.am:11: error: automatic de-ANSI-fication support has been removed
|
||||
|
||||
|
||||
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
2012/05/03
|
||||
|
||||
Index: lrzsz-0.12.20/configure.in
|
||||
===================================================================
|
||||
--- lrzsz-0.12.20.orig/configure.in
|
||||
+++ lrzsz-0.12.20/configure.in
|
||||
@@ -92,7 +92,6 @@ AC_PROG_RANLIB
|
||||
AC_ISC_POSIX
|
||||
AC_AIX
|
||||
AC_MINIX
|
||||
-AM_C_PROTOTYPES
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
Index: lrzsz-0.12.20/lib/Makefile.am
|
||||
===================================================================
|
||||
--- lrzsz-0.12.20.orig/lib/Makefile.am
|
||||
+++ lrzsz-0.12.20/lib/Makefile.am
|
||||
@@ -1,6 +1,5 @@
|
||||
noinst_LIBRARIES=libzmodem.a
|
||||
CFLAGS=@CFLAGS@
|
||||
-AUTOMAKE_OPTIONS=ansi2knr
|
||||
|
||||
EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
|
||||
getopt.c getopt1.c mkdir.c mktime.c \
|
||||
Index: lrzsz-0.12.20/src/Makefile.am
|
||||
===================================================================
|
||||
--- lrzsz-0.12.20.orig/src/Makefile.am
|
||||
+++ lrzsz-0.12.20/src/Makefile.am
|
||||
@@ -8,7 +8,6 @@ CFLAGS=@CFLAGS@
|
||||
DISTCLEAN_FILES=lrzszbug
|
||||
|
||||
LDADD = ../lib/libzmodem.a @LIBINTL@
|
||||
-AUTOMAKE_OPTIONS=ansi2knr
|
||||
EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
|
||||
INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
|
||||
#DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
|
||||
@@ -13,11 +13,9 @@ DEPENDS = ""
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
|
||||
file://autotools-update.patch \
|
||||
file://autotools.patch \
|
||||
file://makefile.patch \
|
||||
file://gettext.patch \
|
||||
file://acdefine.patch \
|
||||
file://lrzsz_fix_for_automake-1.12.patch \
|
||||
file://lrzsz-check-locale.h.patch \
|
||||
file://cve-2018-10195.patch \
|
||||
file://include.patch \
|
||||
|
||||
Reference in New Issue
Block a user