Line
Link Here
|
0 |
-- elfutils-0.166.orig/configure.ac |
0 |
++ elfutils-0.166/configure.ac |
Lines 54-59
AC_CONFIG_FILES([m4/Makefile])
Link Here
|
54 |
dnl The RPM spec file. We substitute a few values in the file. |
54 |
dnl The RPM spec file. We substitute a few values in the file. |
55 |
AC_CONFIG_FILES([elfutils.spec:config/elfutils.spec.in]) |
55 |
AC_CONFIG_FILES([elfutils.spec:config/elfutils.spec.in]) |
56 |
|
56 |
|
|
|
57 |
dnl Check if we have dgettext available from our libc |
58 |
AC_LINK_IFELSE( |
59 |
[AC_LANG_PROGRAM( |
60 |
[#include <libintl.h>], |
61 |
[char *test=dgettext("test","test"); return 0;] |
62 |
)], |
63 |
[libc_has_dgettext="true"], |
64 |
[libc_has_dgettext="false"] |
65 |
) |
66 |
|
67 |
dnl If our libc doesn't provide dgettext, then test for libintl support |
68 |
if test "$libc_has_dgettext" = "false" ; then |
69 |
OLD_LIBS="$LIBS" |
70 |
LIBS="$OLD_LIBS -lintl" |
71 |
AC_MSG_WARN("libc does not have dgettext") |
72 |
AC_LINK_IFELSE( |
73 |
[AC_LANG_PROGRAM( |
74 |
[#include <libintl.h>], |
75 |
[char *test=dgettext("test","test"); return 0;] |
76 |
)], |
77 |
[libintl_has_dgettext="true"], |
78 |
[libintl_has_dgettext="false"] |
79 |
) |
80 |
if test "$libintl_has_dgettext" = "false"; then |
81 |
AC_MSG_ERROR("no libintl with dgettext found") |
82 |
else |
83 |
intl_LDADD="-lintl" |
84 |
fi |
85 |
LIBS="$OLD_LIBS" |
86 |
else |
87 |
intl_LDADD="" |
88 |
fi |
89 |
AC_SUBST([intl_LDADD]) |
90 |
|
57 |
|
91 |
|
58 |
AC_CANONICAL_HOST |
92 |
AC_CANONICAL_HOST |
59 |
|
93 |
|
60 |
-- elfutils-0.166.orig/libasm/Makefile.am |
94 |
++ elfutils-0.166/libasm/Makefile.am |
Lines 56-61
libasm_pic_a_SOURCES =
Link Here
|
56 |
am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) |
56 |
am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) |
57 |
|
57 |
|
58 |
libasm_so_LDLIBS = |
58 |
libasm_so_LDLIBS = |
|
|
59 |
libasm_so_LDLIBS += $(intl_LDADD) |
59 |
if USE_LOCKS |
60 |
if USE_LOCKS |
60 |
libasm_so_LDLIBS += -lpthread |
61 |
libasm_so_LDLIBS += -lpthread |
61 |
endif |
62 |
endif |
62 |
-- elfutils-0.166.orig/libdw/Makefile.am |
63 |
++ elfutils-0.166/libdw/Makefile.am |
Lines 112-118
libdw.so$(EXEEXT): $(srcdir)/libdw.map l
Link Here
|
112 |
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ |
112 |
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ |
113 |
-Wl,--version-script,$<,--no-undefined \ |
113 |
-Wl,--version-script,$<,--no-undefined \ |
114 |
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ |
114 |
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ |
115 |
-ldl -lz $(argp_LDADD) $(zip_LIBS) |
115 |
-ldl -lz $(argp_LDADD) $(intl_LDADD) $(zip_LIBS) |
116 |
@$(textrel_check) |
116 |
@$(textrel_check) |
117 |
$(AM_V_at)ln -fs $@ $@.$(VERSION) |
117 |
$(AM_V_at)ln -fs $@ $@.$(VERSION) |
118 |
|
118 |
|
119 |
-- elfutils-0.166.orig/libelf/Makefile.am |
119 |
++ elfutils-0.166/libelf/Makefile.am |
Lines 96-101
libelf_pic_a_SOURCES =
Link Here
|
96 |
am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) |
96 |
am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) |
97 |
|
97 |
|
98 |
libelf_so_LDLIBS = -lz |
98 |
libelf_so_LDLIBS = -lz |
|
|
99 |
libelf_so_LDLIBS += $(intl_LDADD) |
99 |
if USE_LOCKS |
100 |
if USE_LOCKS |
100 |
libelf_so_LDLIBS += -lpthread |
101 |
libelf_so_LDLIBS += -lpthread |
101 |
endif |
102 |
endif |
102 |
-- elfutils-0.166.orig/src/Makefile.am |
103 |
++ elfutils-0.166/src/Makefile.am |
Lines 104-131
ranlib_no_Wstack_usage = yes
Link Here
|
104 |
ar_no_Wstack_usage = yes |
104 |
ar_no_Wstack_usage = yes |
105 |
unstrip_no_Wstack_usage = yes |
105 |
unstrip_no_Wstack_usage = yes |
106 |
|
106 |
|
107 |
readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl |
107 |
readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl |
108 |
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \ |
108 |
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl \ |
109 |
$(demanglelib) |
109 |
$(demanglelib) |
110 |
size_LDADD = $(libelf) $(libeu) $(argp_LDADD) |
110 |
size_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) |
111 |
strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl |
111 |
strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl |
112 |
ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl |
112 |
ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl |
113 |
if NATIVE_LD |
113 |
if NATIVE_LD |
114 |
# -ldl is always needed for libebl. |
114 |
# -ldl is always needed for libebl. |
115 |
ld_LDADD += libld_elf.a |
115 |
ld_LDADD += libld_elf.a |
116 |
endif |
116 |
endif |
117 |
ld_LDFLAGS = -rdynamic |
117 |
ld_LDFLAGS = -rdynamic |
118 |
elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl |
118 |
elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl |
119 |
findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) |
119 |
findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(intl_LDADD) |
120 |
addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib) |
120 |
addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(intl_LDADD) $(demanglelib) |
121 |
elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) -ldl |
121 |
elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) $(intl_LDADD) -ldl |
122 |
objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl |
122 |
objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl |
123 |
ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) |
123 |
ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) |
124 |
strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) |
124 |
strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) |
125 |
ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) |
125 |
ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(intl_LDADD) |
126 |
unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl |
126 |
unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl |
127 |
stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl $(demanglelib) |
127 |
stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(intl_LDADD) -ldl $(demanglelib) |
128 |
elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) |
128 |
elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(intl_LDADD) |
129 |
|
129 |
|
130 |
ldlex.o: ldscript.c |
130 |
ldlex.o: ldscript.c |
131 |
ldlex_no_Werror = yes |
131 |
ldlex_no_Werror = yes |