mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-10 18:53:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: Fix build with automake 1.12.1

Browse Source 
Added new patches:
   avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
   gnutls_fix_for_automake_1.12.1.patch

more details in patch headers.

(From OE-Core rev: 547ab3e32770e318b6d21334e4ecf17af2eef3ca)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble
2012-07-09 03:30:10 -07:00
committed by Richard Purdie
parent e24ec0cb5e
commit cd3fcdd4c1
3 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-support/gnutls/gnutls/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch Normal file
View File

@@ -0,0 +1,51 @@
Upsteam-Status: Inappropriate
automake 1.12.x has depricated AM_PROG_MKDIR_P , and throws a warning for that,
and the warnings are treated as errors becuase of the -Werror parameter.
These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not
eliminated these depricated macros yet. So disable the treatment of warnings
as errors until gettext is updeated to remove the depricated macros.
Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2012/07/09
Index: gnutls-2.12.19/configure.ac
===================================================================
--- gnutls-2.12.19.orig/configure.ac
+++ gnutls-2.12.19/configure.ac
@@ -26,7 +26,7 @@ AC_INIT([GnuTLS], [2.12.19], [bug-gnutls
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override])
+AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_CONFIG_HEADER(config.h)
Index: gnutls-2.12.19/lib/configure.ac
===================================================================
--- gnutls-2.12.19.orig/lib/configure.ac
+++ gnutls-2.12.19/lib/configure.ac
@@ -26,7 +26,7 @@ AC_INIT([libgnutls], [2.12.19], [bug-gnu
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-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])])
AM_CONFIG_HEADER(config.h)
Index: gnutls-2.12.19/libextra/configure.ac
===================================================================
--- gnutls-2.12.19.orig/libextra/configure.ac
+++ gnutls-2.12.19/libextra/configure.ac
@@ -26,7 +26,7 @@ AC_INIT([libgnutls-extra], [2.12.19], [b
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-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])])
AM_CONFIG_HEADER(config.h)

43
meta/recipes-support/gnutls/gnutls/gnutls_fix_for_automake_1.12.1.patch Normal file
View File

@@ -0,0 +1,43 @@
Upsteam-Status: Pending
Avoids these kind of warnings:
Warning: 'libgnutls.la': linking libtool libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2012/07/09
Index: gnutls-2.12.19/configure.ac
===================================================================
--- gnutls-2.12.19.orig/configure.ac
+++ gnutls-2.12.19/configure.ac
@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
AM_CONFIG_HEADER(config.h)
AC_MSG_RESULT([***
Index: gnutls-2.12.19/lib/configure.ac
===================================================================
--- gnutls-2.12.19.orig/lib/configure.ac
+++ gnutls-2.12.19/lib/configure.ac
@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
Index: gnutls-2.12.19/libextra/configure.ac
===================================================================
--- gnutls-2.12.19.orig/libextra/configure.ac
+++ gnutls-2.12.19/libextra/configure.ac
@@ -28,6 +28,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # required by automake 1.12
AM_CONFIG_HEADER(config.h)
AC_PROG_CC

2
meta/recipes-support/gnutls/gnutls_2.12.20.bb
View File

@@ -5,6 +5,8 @@ PR = "${INC_PR}.2"
SRC_URI += "file://gnutls-openssl.patch \
file://correct_rpl_gettimeofday_signature.patch \
file://configure-fix.patch \
file://gnutls_fix_for_automake_1.12.1.patch \
file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \
${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
file://remove-gets.patch \
"