summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:34 +0200
committerSaul Wold <sgw@linux.intel.com>2013-01-09 16:40:36 -0800
commitc36b032c406f50b8edea961785edca332dc6f843 (patch)
treec7462f7dc98c443fa443d0e223e28194603ee07a /meta/recipes-devtools
parentb15e22beed948f79b6ae953df7b889f3e70588b9 (diff)
downloadopenembedded-core-c36b032c406f50b8edea961785edca332dc6f843.tar.gz
openembedded-core-c36b032c406f50b8edea961785edca332dc6f843.tar.bz2
openembedded-core-c36b032c406f50b8edea961785edca332dc6f843.zip
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. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools')
-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 @@
+Upstream-Status: Backport [fixed in file-5.12]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
+--- file-5.11/configure.ac 2012-02-21 21:16:29.000000000 +0200
++++ file-5.11/configure.ac 2013-01-02 07:18:23.004856505 +0200
+@@ -3,7 +3,7 @@
+ AM_INIT_AUTOMAKE()
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+
+ 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
DEPENDS = "zlib file-native"
DEPENDS_class-native = "zlib-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
file://fix_version_check.patch \
+ file://obsolete_automake_macros.patch \
file://dump \
file://filesystems"