diff options
author | Adrian Bunk <bunk@stusta.de> | 2020-02-27 22:10:07 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-02-27 12:50:23 -0800 |
commit | 31557db9bb8c711c3850d32a4f8964d501470e22 (patch) | |
tree | 786a086fb4d224b4227ae32e87eb10ec3c1f7c30 /meta-oe | |
parent | acd1bfd1690b5da767608f3ed1f7d56eb68d7e02 (diff) | |
download | meta-openembedded-contrib-31557db9bb8c711c3850d32a4f8964d501470e22.tar.gz |
libidn: Remove obsolete patches for issues already fixed upstream
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
3 files changed, 0 insertions, 71 deletions
diff --git a/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch deleted file mode 100644 index 43bd232944..0000000000 --- a/meta-oe/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble <nitin.a.kamble@intel.com> -Date: Tue, 10 Jul 2012 02:44:30 -0700 -Subject: [PATCH] libidn: fix build with automake 1.12 - -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 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 261dad2..c4f935e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn@gnu.org]) - 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]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - # Library code modified: REVISION++ diff --git a/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch deleted file mode 100644 index 3c0559e34f..0000000000 --- a/meta-oe/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 -From: Nitin A Kamble <nitin.a.kamble@intel.com> -Date: Wed, 2 May 2012 18:05:19 -0700 -Subject: [PATCH] libtasn1: fix build with automake 1.12 - -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 - ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8297649..7b9626e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) - AC_SUBST(LT_REVISION, 0) - 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 diff --git a/meta-oe/recipes-extended/libidn/libidn_1.35.bb b/meta-oe/recipes-extended/libidn/libidn_1.35.bb index d5ce5b46bd..105740354c 100644 --- a/meta-oe/recipes-extended/libidn/libidn_1.35.bb +++ b/meta-oe/recipes-extended/libidn/libidn_1.35.bb @@ -15,8 +15,6 @@ DEPENDS = "virtual/libiconv autoconf-archive" inherit pkgconfig autotools gettext texinfo gtk-doc SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ file://dont-depend-on-help2man.patch \ file://0001-idn-format-security-warnings.patch \ " |