diff options
| author | Radu Moisan <radu.moisan@intel.com> | 2013-06-19 12:12:09 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-10 09:41:55 +0100 |
| commit | 1f5bd7639dc60f910b4ca7d2a645956afb125fce (patch) | |
| tree | 3b713751a8624d3a837cae299d82c5e6548f8547 /meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch | |
| parent | 749fcafb080c41a9bc1e56880227e40d8dd70b88 (diff) | |
| download | poky-1f5bd7639dc60f910b4ca7d2a645956afb125fce.tar.gz | |
elfutils: Upgrade to v0.155
*license changed to GPLv3
*several patches were absolete so I removed them
*redhat-portability & redhat-robustify backported from
latest elfutils-portability & elfutils-robustify from
upstream
(From OE-Core rev: 6edbaf14f875b7759672e8d118c59a01dbdeb853)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch')
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch b/meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch new file mode 100644 index 0000000000..fbaf1e9dcd --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.155/uclibc-support.patch | |||
| @@ -0,0 +1,91 @@ | |||
| 1 | on uclibc systems libintl and libuargp are separate from libc. | ||
| 2 | so they need to be specified on commandline when we use proxy-libintl | ||
| 3 | then libintl is a static archive so it should be listed last since | ||
| 4 | elfutils does not respect disable-nls we need to link in libintl | ||
| 5 | |||
| 6 | We add a new option --enable-uclibc which will be used to control | ||
| 7 | the uclibc specific configurations during build. | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem> | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [uclibc specific] | ||
| 12 | |||
| 13 | Index: elfutils-0.155/configure.ac | ||
| 14 | =================================================================== | ||
| 15 | --- elfutils-0.155.orig/configure.ac | ||
| 16 | +++ elfutils-0.155/configure.ac | ||
| 17 | @@ -55,9 +55,16 @@ AS_IF([test "$use_locks" = yes], [AC_DEF | ||
| 18 | |||
| 19 | AH_TEMPLATE([USE_LOCKS], [Defined if libraries should be thread-safe.]) | ||
| 20 | |||
| 21 | +AC_ARG_ENABLE([uclibc], | ||
| 22 | +AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]), | ||
| 23 | +use_uclibc=yes, use_uclibc=no) | ||
| 24 | +AM_CONDITIONAL(USE_UCLIBC, test "$use_uclibc" = yes) | ||
| 25 | +AS_IF([test "$use_uclibc" = yes], [AC_DEFINE(USE_UCLIBC)]) | ||
| 26 | + | ||
| 27 | +AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.]) | ||
| 28 | + | ||
| 29 | dnl Add all the languages for which translations are available. | ||
| 30 | ALL_LINGUAS= | ||
| 31 | - | ||
| 32 | AC_PROG_CC | ||
| 33 | AC_PROG_RANLIB | ||
| 34 | AC_PROG_YACC | ||
| 35 | Index: elfutils-0.155/libelf/Makefile.am | ||
| 36 | =================================================================== | ||
| 37 | --- elfutils-0.155.orig/libelf/Makefile.am | ||
| 38 | +++ elfutils-0.155/libelf/Makefile.am | ||
| 39 | @@ -93,7 +93,12 @@ if !MUDFLAP | ||
| 40 | libelf_pic_a_SOURCES = | ||
| 41 | am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) | ||
| 42 | |||
| 43 | + | ||
| 44 | libelf_so_LDLIBS = | ||
| 45 | +if USE_UCLIBC | ||
| 46 | +libelf_so_LDLIBS += -lintl -luargp | ||
| 47 | +endif | ||
| 48 | + | ||
| 49 | if USE_LOCKS | ||
| 50 | libelf_so_LDLIBS += -lpthread | ||
| 51 | endif | ||
| 52 | Index: elfutils-0.155/libdw/Makefile.am | ||
| 53 | =================================================================== | ||
| 54 | --- elfutils-0.155.orig/libdw/Makefile.am | ||
| 55 | +++ elfutils-0.155/libdw/Makefile.am | ||
| 56 | @@ -98,6 +98,11 @@ if !MUDFLAP | ||
| 57 | libdw_pic_a_SOURCES = | ||
| 58 | am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) | ||
| 59 | |||
| 60 | +libdw_so_LDLIBS = | ||
| 61 | +if USE_UCLIBC | ||
| 62 | +libdw_so_LDLIBS += -lintl -luargp | ||
| 63 | +endif | ||
| 64 | + | ||
| 65 | libdw_so_SOURCES = | ||
| 66 | libdw.so: $(srcdir)/libdw.map libdw_pic.a \ | ||
| 67 | ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \ | ||
| 68 | @@ -108,7 +113,7 @@ libdw.so: $(srcdir)/libdw.map libdw_pic. | ||
| 69 | -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ | ||
| 70 | -Wl,--version-script,$<,--no-undefined \ | ||
| 71 | -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ | ||
| 72 | - -ldl $(zip_LIBS) | ||
| 73 | + -ldl $(zip_LIBS) $(libdw_so_LDLIBS) | ||
| 74 | if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi | ||
| 75 | ln -fs $@ $@.$(VERSION) | ||
| 76 | |||
| 77 | Index: elfutils-0.155/libcpu/Makefile.am | ||
| 78 | =================================================================== | ||
| 79 | --- elfutils-0.155.orig/libcpu/Makefile.am | ||
| 80 | +++ elfutils-0.155/libcpu/Makefile.am | ||
| 81 | @@ -63,6 +63,10 @@ i386_parse_CFLAGS = -DNMNES="`wc -l < i3 | ||
| 82 | i386_lex.o: i386_parse.h | ||
| 83 | i386_gendis_LDADD = $(libeu) -lm $(libmudflap) | ||
| 84 | |||
| 85 | +if USE_UCLIBC | ||
| 86 | +i386_gendis_LDADD += -luargp -lintl | ||
| 87 | +endif | ||
| 88 | + | ||
| 89 | i386_parse.h: i386_parse.c ; | ||
| 90 | |||
| 91 | noinst_HEADERS = memory-access.h i386_parse.h i386_data.h | ||
