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/0003-memcpy-def.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/0003-memcpy-def.patch')
-rw-r--r-- | package/elfutils/0003-memcpy-def.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/elfutils/0003-memcpy-def.patch b/package/elfutils/0003-memcpy-def.patch new file mode 100644 index 0000000000..509482774c --- /dev/null +++ b/package/elfutils/0003-memcpy-def.patch @@ -0,0 +1,26 @@ +Provide a compatibility alias __memcpy + +For some reason, libelf uses the internal glibc alias __memcpy, which +doesn't exist in uClibc. Add a manual alias so that the build can +proceed with uClibc. + +Based on the former patch by Thomas Petazzoni. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> + +diff -rup a/libelf/libelf.h b/libelf/libelf.h +--- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100 ++++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000 +@@ -34,6 +34,11 @@ + /* Get the ELF types. */ + #include <elf.h> + ++#ifndef _LIBC ++#ifndef __mempcpy ++#define __mempcpy mempcpy ++#endif ++#endif + + /* Known translation types. */ + typedef enum |