summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:11 +0000
commit244296421a6cb8a45792e0f35d05fa5285290363 (patch)
tree044d597773dc36acfc7f953ad1a40ca9b2b696e8
parent4bb69608bb81c44853729d7bb8fc9ddf75bf32c4 (diff)
downloadpoky-244296421a6cb8a45792e0f35d05fa5285290363.tar.gz
file: 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. (From OE-Core rev: c36b032c406f50b8edea961785edca332dc6f843) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/file/file/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-devtools/file/file_5.11.bb3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..84a78a5770
--- /dev/null
+++ b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Backport [fixed in file-5.12]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
5--- file-5.11/configure.ac 2012-02-21 21:16:29.000000000 +0200
6+++ file-5.11/configure.ac 2013-01-02 07:18:23.004856505 +0200
7@@ -3,7 +3,7 @@
8 AM_INIT_AUTOMAKE()
9 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 AC_CONFIG_MACRO_DIR([m4])
14
15 AC_MSG_CHECKING(for builtin ELF support)
diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.11.bb
index be6a863dbf..52ae460e60 100644
--- a/meta/recipes-devtools/file/file_5.11.bb
+++ b/meta/recipes-devtools/file/file_5.11.bb
@@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
10 10
11DEPENDS = "zlib file-native" 11DEPENDS = "zlib file-native"
12DEPENDS_class-native = "zlib-native" 12DEPENDS_class-native = "zlib-native"
13PR = "r0" 13PR = "r1"
14 14
15SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ 15SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
16 file://fix_version_check.patch \ 16 file://fix_version_check.patch \
17 file://obsolete_automake_macros.patch \
17 file://dump \ 18 file://dump \
18 file://filesystems" 19 file://filesystems"
19 20