diff options
Diffstat (limited to 'meta/recipes-extended/libidn/libidn')
3 files changed, 74 insertions, 0 deletions
diff --git a/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch new file mode 100644 index 0000000000..3476bb9596 --- /dev/null +++ b/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, | ||
4 | and the warnings are treated as errors because of the -Werror parameter. | ||
5 | |||
6 | These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not | ||
7 | eliminated these deprecated macros yet. So disable the treatment of warnings | ||
8 | as errors until gettext is updated to remove the deprecated macros. | ||
9 | |||
10 | Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
11 | 2012/07/10 | ||
12 | |||
13 | Index: libidn-1.24/configure.ac | ||
14 | =================================================================== | ||
15 | --- libidn-1.24.orig/configure.ac | ||
16 | +++ libidn-1.24/configure.ac | ||
17 | @@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2011 Si | ||
18 | AC_CONFIG_AUX_DIR([build-aux]) | ||
19 | AC_CONFIG_MACRO_DIR([m4]) | ||
20 | AC_CONFIG_HEADERS(config.h) | ||
21 | -AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) | ||
22 | +AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) | ||
23 | AM_SILENT_RULES([yes]) | ||
24 | |||
25 | # Library code modified: REVISION++ | ||
diff --git a/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch new file mode 100644 index 0000000000..0863530f29 --- /dev/null +++ b/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurdd libidn-1.26/doc/Makefile.am libidn-1.26/doc/Makefile.am | ||
5 | --- libidn-1.26/doc/Makefile.am 2012-09-18 11:25:45.000000000 +0300 | ||
6 | +++ libidn-1.26/doc/Makefile.am 2013-02-08 07:41:24.591431462 +0200 | ||
7 | @@ -49,15 +49,9 @@ | ||
8 | |||
9 | # Man pages. | ||
10 | |||
11 | -dist_man_MANS = idn.1 $(gdoc_MANS) | ||
12 | +dist_man_MANS = $(gdoc_MANS) | ||
13 | MAINTAINERCLEANFILES = $(dist_man_MANS) | ||
14 | |||
15 | -idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo \ | ||
16 | - $(top_srcdir)/configure.ac | ||
17 | - $(HELP2MAN) \ | ||
18 | - --name="Internationalized Domain Names command line tool" \ | ||
19 | - --output=$@ $(top_builddir)/src/idn$(EXEEXT) | ||
20 | - | ||
21 | # GDOC | ||
22 | |||
23 | GDOC_BIN = $(srcdir)/gdoc | ||
diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..20afd257be --- /dev/null +++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch fixes following issue with automake 1.12 | ||
4 | |||
5 | | automake: warnings are treated as errors | ||
6 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX | ||
7 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' | ||
8 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | 2012/05/03 | ||
11 | |||
12 | Index: libidn-1.24/configure.ac | ||
13 | =================================================================== | ||
14 | --- libidn-1.24.orig/configure.ac | ||
15 | +++ libidn-1.24/configure.ac | ||
16 | @@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17) | ||
17 | AC_SUBST(LT_REVISION, 7) | ||
18 | AC_SUBST(LT_AGE, 6) | ||
19 | |||
20 | +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it | ||
21 | +m4_pattern_allow([AM_PROG_AR]) | ||
22 | +AM_PROG_AR | ||
23 | + | ||
24 | AC_PROG_CC | ||
25 | gl_EARLY | ||
26 | lgl_EARLY | ||