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