diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/elfutils/elfutils-05-disable-po.patch | |
parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
download | buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.zip |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/elfutils/elfutils-05-disable-po.patch')
-rw-r--r-- | package/elfutils/elfutils-05-disable-po.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/package/elfutils/elfutils-05-disable-po.patch b/package/elfutils/elfutils-05-disable-po.patch deleted file mode 100644 index d98da0b0f6..0000000000 --- a/package/elfutils/elfutils-05-disable-po.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable the build of the po/ directory - -Building the po/ directory complains that the scripts in there have -been generated with gettext 0.17, while we use gettext 0.18 in -Buildroot. Since we don't care that much about po files anyway, just -disable the build of this directory. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,7 @@ - - # Add doc back when we have some real content. - SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \ -- $(PROGS_SUBDIR) po tests -+ $(PROGS_SUBDIR) tests - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 |