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 | |
parent | acd1bfd1690b5da767608f3ed1f7d56eb68d7e02 (diff) | |
download | meta-openembedded-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>
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 @@ | |||
1 | From cdd9e2e960eeb4eda7b08f0113d0cd03524c1d45 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
3 | Date: Tue, 10 Jul 2012 02:44:30 -0700 | ||
4 | Subject: [PATCH] libidn: fix build with automake 1.12 | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | automake 1.12.x has deprecated AM_PROG_MKDIR_P , and throws a warning for that, | ||
9 | and the warnings are treated as errors because of the -Werror parameter. | ||
10 | |||
11 | These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not | ||
12 | eliminated these deprecated macros yet. So disable the treatment of warnings | ||
13 | as errors until gettext is updated to remove the deprecated macros. | ||
14 | |||
15 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
16 | 2012/07/10 | ||
17 | |||
18 | --- | ||
19 | configure.ac | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 261dad2..c4f935e 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -22,7 +22,7 @@ AC_INIT([GNU Libidn], [1.34], [bug-libidn@gnu.org]) | ||
27 | AC_CONFIG_AUX_DIR([build-aux]) | ||
28 | AC_CONFIG_MACRO_DIR([m4]) | ||
29 | AC_CONFIG_HEADERS(config.h) | ||
30 | -AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) | ||
31 | +AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) | ||
32 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
33 | |||
34 | # 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 @@ | |||
1 | From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 | ||
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
3 | Date: Wed, 2 May 2012 18:05:19 -0700 | ||
4 | Subject: [PATCH] libtasn1: fix build with automake 1.12 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | This patch fixes following issue with automake 1.12 | ||
9 | |||
10 | | automake: warnings are treated as errors | ||
11 | | /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 | ||
12 | | /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' | ||
13 | |||
14 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
15 | 2012/05/03 | ||
16 | |||
17 | --- | ||
18 | configure.ac | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 8297649..7b9626e 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) | ||
26 | AC_SUBST(LT_REVISION, 0) | ||
27 | AC_SUBST(LT_AGE, 6) | ||
28 | |||
29 | +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it | ||
30 | +m4_pattern_allow([AM_PROG_AR]) | ||
31 | +AM_PROG_AR | ||
32 | + | ||
33 | AC_PROG_CC | ||
34 | gl_EARLY | ||
35 | 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" | |||
15 | inherit pkgconfig autotools gettext texinfo gtk-doc | 15 | inherit pkgconfig autotools gettext texinfo gtk-doc |
16 | 16 | ||
17 | SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ | 17 | SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ |
18 | file://libidn_fix_for_automake-1.12.patch \ | ||
19 | file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ | ||
20 | file://dont-depend-on-help2man.patch \ | 18 | file://dont-depend-on-help2man.patch \ |
21 | file://0001-idn-format-security-warnings.patch \ | 19 | file://0001-idn-format-security-warnings.patch \ |
22 | " | 20 | " |