diff options
| author |   Marko Lindqvist <cazfi74@gmail.com> | 2013-01-08 09:16:43 +0200 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-01-09 16:40:37 -0800 |
| commit | 861857cc3df0ad12172bb76b09769e43c95b73c6 (patch) | |
| tree | 44c5a637292873ef88bddc5579f7f1bf496b99ca /meta/recipes-support/gnutls | |
| parent | 43bb038e17b110fe5d0c4f6d7fb2fa2bfa4193a9 (diff) | |
| download | openembedded-core-contrib-861857cc3df0ad12172bb76b09769e43c95b73c6.tar.gz | |
gnutls: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls')
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls_2.12.21.bb | 3 |
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch new file mode 100644 index 0000000000..564017878f --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/obsolete_automake_macros.patch @@ -0,0 +1,39 @@ +Upstream-Status: Submitted [https://savannah.gnu.org/support/index.php?108219] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd gnutls-2.12.21/configure.ac gnutls-2.12.21/configure.ac +--- gnutls-2.12.21/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/configure.ac 2013-01-03 07:53:41.662739378 +0200 +@@ -29,7 +29,7 @@ + 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_CONFIG_HEADERS(config.h) + + AC_MSG_RESULT([*** + *** Checking for compilation programs... +diff -Nurd gnutls-2.12.21/lib/configure.ac gnutls-2.12.21/lib/configure.ac +--- gnutls-2.12.21/lib/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/lib/configure.ac 2013-01-03 08:07:38.150721027 +0200 +@@ -29,7 +29,7 @@ + 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_CONFIG_HEADERS(config.h) + + AC_PROG_CC + lgl_EARLY +diff -Nurd gnutls-2.12.21/libextra/configure.ac gnutls-2.12.21/libextra/configure.ac +--- gnutls-2.12.21/libextra/configure.ac 2013-01-03 07:52:42.182740682 +0200 ++++ gnutls-2.12.21/libextra/configure.ac 2013-01-03 08:10:56.654716669 +0200 +@@ -29,7 +29,7 @@ + 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_CONFIG_HEADERS(config.h) + + AC_PROG_CC + xgl_EARLY diff --git a/meta/recipes-support/gnutls/gnutls_2.12.21.bb b/meta/recipes-support/gnutls/gnutls_2.12.21.bb index 6b2ef3a2a3..7b4426bf26 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.21.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.21.bb @@ -1,12 +1,13 @@ require gnutls.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" 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://obsolete_automake_macros.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 \ " |