diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-support/gnutls/libtasn1 | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-support/gnutls/libtasn1')
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch | 14 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch | 28 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch new file mode 100644 index 0000000000..2ac89f3b32 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd libtasn1-2.14/doc/Makefile.am libtasn1-2.14/doc/Makefile.am | ||
5 | --- libtasn1-2.14/doc/Makefile.am 2012-09-24 15:08:42.000000000 +0300 | ||
6 | +++ libtasn1-2.14/doc/Makefile.am 2013-01-03 07:35:26.702763403 +0200 | ||
7 | @@ -31,7 +31,7 @@ | ||
8 | AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \ | ||
9 | --no-split --number-sections --css-include=texinfo.css | ||
10 | |||
11 | -dist_man_MANS = $(gdoc_MANS) asn1Parser.1 asn1Coding.1 asn1Decoding.1 | ||
12 | +dist_man_MANS = $(gdoc_MANS) | ||
13 | |||
14 | HELP2MAN_OPTS = --info-page libtasn1 | ||
diff --git a/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch b/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch new file mode 100644 index 0000000000..5540bef940 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This patch avoids following issues with automake 1.12: | ||
4 | |||
5 | | automake: warnings are treated as errors | ||
6 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libtasn1.la': linking libtool libraries using a non-POSIX | ||
7 | | /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' | ||
8 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | 2012/05/02 | ||
11 | |||
12 | |||
13 | Index: libtasn1-2.11/configure.ac | ||
14 | =================================================================== | ||
15 | --- libtasn1-2.11.orig/configure.ac | ||
16 | +++ libtasn1-2.11/configure.ac | ||
17 | @@ -38,6 +38,11 @@ lgl_EARLY | ||
18 | AC_PROG_YACC | ||
19 | AC_PROG_LN_S | ||
20 | |||
21 | +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it | ||
22 | +m4_pattern_allow([AM_PROG_AR]) | ||
23 | +AM_PROG_AR | ||
24 | + | ||
25 | + | ||
26 | dnl Checks for programs. | ||
27 | AC_PROG_INSTALL | ||
28 | AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) | ||