summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch51
-rw-r--r--meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch43
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.20.bb2
3 files changed, 96 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
new file mode 100644
index 0000000000..dde683f26d
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
@@ -0,0 +1,51 @@
1Upsteam-Status: Inappropriate
2
3automake 1.12.x has depricated AM_PROG_MKDIR_P , and throws a warning for that,
4and the warnings are treated as errors becuase of the -Werror parameter.
5
6These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not
7eliminated these depricated macros yet. So disable the treatment of warnings
8as errors until gettext is updeated to remove the depricated macros.
9
10Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
112012/07/09
12
13Index: gnutls-2.12.19/configure.ac
14===================================================================
15--- gnutls-2.12.19.orig/configure.ac
16+++ gnutls-2.12.19/configure.ac
17@@ -26,7 +26,7 @@ AC_INIT([GnuTLS], [2.12.19], [bug-gnutls
18 AC_CONFIG_AUX_DIR([build-aux])
19 AC_CONFIG_MACRO_DIR([m4])
20
21-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override])
22+AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
23 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
24 AM_CONFIG_HEADER(config.h)
25
26Index: gnutls-2.12.19/lib/configure.ac
27===================================================================
28--- gnutls-2.12.19.orig/lib/configure.ac
29+++ gnutls-2.12.19/lib/configure.ac
30@@ -26,7 +26,7 @@ AC_INIT([libgnutls], [2.12.19], [bug-gnu
31 AC_CONFIG_AUX_DIR([build-aux])
32 AC_CONFIG_MACRO_DIR([m4])
33
34-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
35+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
36 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
37 AM_CONFIG_HEADER(config.h)
38
39Index: gnutls-2.12.19/libextra/configure.ac
40===================================================================
41--- gnutls-2.12.19.orig/libextra/configure.ac
42+++ gnutls-2.12.19/libextra/configure.ac
43@@ -26,7 +26,7 @@ AC_INIT([libgnutls-extra], [2.12.19], [b
44 AC_CONFIG_AUX_DIR([build-aux])
45 AC_CONFIG_MACRO_DIR([m4])
46
47-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
48+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
49 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
50 AM_CONFIG_HEADER(config.h)
51
diff --git a/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch b/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch
new file mode 100644
index 0000000000..1625255583
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch
@@ -0,0 +1,43 @@
1Upsteam-Status: Pending
2
3Avoids these kind of warnings:
4Warning: 'libgnutls.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
5
6Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
7Date: 2012/07/09
8Index: gnutls-2.12.19/configure.ac
9===================================================================
10--- gnutls-2.12.19.orig/configure.ac
11+++ gnutls-2.12.19/configure.ac
12@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
13
14 AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
15 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
16+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
17 AM_CONFIG_HEADER(config.h)
18
19 AC_MSG_RESULT([***
20Index: gnutls-2.12.19/lib/configure.ac
21===================================================================
22--- gnutls-2.12.19.orig/lib/configure.ac
23+++ gnutls-2.12.19/lib/configure.ac
24@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
25
26 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
27 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
28+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
29 AM_CONFIG_HEADER(config.h)
30
31 AC_PROG_CC
32Index: gnutls-2.12.19/libextra/configure.ac
33===================================================================
34--- gnutls-2.12.19.orig/libextra/configure.ac
35+++ gnutls-2.12.19/libextra/configure.ac
36@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
37
38 AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
39 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
40+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
41 AM_CONFIG_HEADER(config.h)
42
43 AC_PROG_CC
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.20.bb b/meta/recipes-support/gnutls/gnutls_2.12.20.bb
index 3a10dbf924..9d33f14bc2 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.20.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.20.bb
@@ -5,6 +5,8 @@ PR = "${INC_PR}.2"
5SRC_URI += "file://gnutls-openssl.patch \ 5SRC_URI += "file://gnutls-openssl.patch \
6 file://correct_rpl_gettimeofday_signature.patch \ 6 file://correct_rpl_gettimeofday_signature.patch \
7 file://configure-fix.patch \ 7 file://configure-fix.patch \
8 file://gnutls_fix_for_automake_1.12.1.patch \
9 file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
8 ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \ 10 ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
9 file://remove-gets.patch \ 11 file://remove-gets.patch \
10 " 12 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-27 20:45:50 +0000