diff options
Diffstat (limited to 'meta/recipes-devtools/diffstat/diffstat')
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat/aclocal.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat/dirfix.patch | 27 |
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch new file mode 100644 index 0000000000..37e518f035 --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro. | ||
2 | The original macro name (AC_ACVERSION) leads to this error: | ||
3 | |||
4 | | autoreconf: running: aclocal --system-acdir=/poky/buildnew/tmp/work/i586-poky-linux/diffstat/1.57-r0/build/aclocal-copy/ --automake-acdir=/poky/buildnew/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force | ||
5 | | aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' | ||
6 | | configure.in:9: error: m4_defn: undefined macro: AC_ACVERSION | ||
7 | | acinclude.m4:989: CF_PROG_CC is expanded from... | ||
8 | | configure.in:9: the top level | ||
9 | | autom4te: m4 failed with exit status: 1 | ||
10 | |||
11 | Upstream-Status: Inappropriate [embedded specific] | ||
12 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> | ||
13 | |||
14 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
15 | index 144a074..fce6eba 100644 | ||
16 | --- a/aclocal.m4 | ||
17 | +++ b/aclocal.m4 | ||
18 | @@ -13,15 +13,15 @@ dnl ------------------ | ||
19 | dnl Conditionally generate script according to whether we're using a given autoconf. | ||
20 | dnl | ||
21 | dnl $1 = version to compare against | ||
22 | -dnl $2 = code to use if AC_ACVERSION is at least as high as $1. | ||
23 | -dnl $3 = code to use if AC_ACVERSION is older than $1. | ||
24 | +dnl $2 = code to use if AC_AUTOCONF_VERSION is at least as high as $1. | ||
25 | +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. | ||
26 | define([CF_ACVERSION_CHECK], | ||
27 | [ | ||
28 | ifdef([m4_version_compare], | ||
29 | -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], | ||
30 | +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], | ||
31 | [CF_ACVERSION_COMPARE( | ||
32 | AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), | ||
33 | -AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl | ||
34 | +AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_AUTOCONF_VERSION)), AC_AUTOCONF_VERSION, [$2], [$3])])])dnl | ||
35 | dnl --------------------------------------------------------------------------- | ||
36 | dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 | ||
37 | dnl -------------------- | ||
diff --git a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch new file mode 100644 index 0000000000..6685056333 --- /dev/null +++ b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | $libdir isn't used by the Makefile at all apart from in this mkdir. | ||
2 | This will be used without any DESTDIR so if your libdir is a different | ||
3 | layout to the bulid system it will cause a failure. E.g: | ||
4 | |||
5 | Build system has /usr/lib only | ||
6 | libdir = /usr/lib64 for the target | ||
7 | Results in "mkdir: cannot create directory `/usr/lib64': Permission denied" | ||
8 | |||
9 | Since the directory is never used, we can just remove the mkdir. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | RP 23/9/2011 | ||
14 | |||
15 | Index: diffstat-1.54/makefile.in | ||
16 | =================================================================== | ||
17 | --- diffstat-1.54.orig/makefile.in 2011-09-22 19:13:11.330158571 +0100 | ||
18 | +++ diffstat-1.54/makefile.in 2011-09-22 19:13:35.610158363 +0100 | ||
19 | @@ -79,7 +79,7 @@ | ||
20 | $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(man1dir)/$(THIS).$(manext) | ||
21 | |||
22 | installdirs : | ||
23 | - mkdir -p $(BINDIR) $(libdir) $(man1dir) | ||
24 | + mkdir -p $(BINDIR) $(man1dir) | ||
25 | |||
26 | uninstall : | ||
27 | rm -f $(BINDIR)/$(PROG) $(man1dir)/$(THIS).$(manext) | ||