55 lines
2.6 KiB
Diff
55 lines
2.6 KiB
Diff
--- binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/bfd/Makefile.am.orig 2014-08-01 21:54:27.917294900 +0400
|
|
+++ binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/bfd/Makefile.am 2014-08-01 23:41:39.388829543 +0400
|
|
@@ -833,7 +833,8 @@
|
|
EXTRA_libbfd_la_SOURCES = $(CFILES)
|
|
libbfd_la_DEPENDENCIES = $(OFILES) ofiles
|
|
libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)
|
|
-libbfd_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ -Wl,--whole-archive -Wl,$(LIBIBERTY) -Wl,$(LIBINTL) -Wl,--no-whole-archive
|
|
+comma := ,
|
|
+libbfd_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@ -Wl,--whole-archive -Wl,$(LIBIBERTY) $(addprefix -Wl$(comma),$(LIBINTL)) -Wl,--no-whole-archive
|
|
|
|
# libtool will build .libs/libbfd.a. We create libbfd.a in the build
|
|
# directory so that we don't have to convert all the programs that use
|
|
--- binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/bfd/Makefile.in.orig 2014-08-01 21:54:27.917294900 +0400
|
|
+++ binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/bfd/Makefile.in 2014-08-01 23:42:11.628451359 +0400
|
|
@@ -341,8 +341,9 @@
|
|
CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
|
|
SUBDIRS = doc po
|
|
bfddocdir = doc
|
|
+comma := ,
|
|
libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
|
|
- @SHARED_LDFLAGS@ $(am__empty) -no-undefined -Wl,--whole-archive -Wl,$(LIBIBERTY) -Wl,$(LIBINTL) -Wl,--no-whole-archive
|
|
+ @SHARED_LDFLAGS@ $(am__empty) -no-undefined -Wl,--whole-archive -Wl,$(LIBIBERTY) $(addprefix -Wl$(comma),$(LIBINTL)) -Wl,--no-whole-archive
|
|
@INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libbfd.la
|
|
@INSTALL_LIBBFD_FALSE@bfdinclude_HEADERS = $(am__append_2)
|
|
@INSTALL_LIBBFD_TRUE@bfdinclude_HEADERS = $(BFD_H) \
|
|
--- binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/intl/localcharset.c.orig 2014-07-24 17:46:54.721150000 +0400
|
|
+++ binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/intl/localcharset.c 2014-08-01 23:46:23.527989681 +0400
|
|
@@ -23,6 +23,10 @@
|
|
# include <config.h>
|
|
#endif
|
|
|
|
+#ifndef STATIC
|
|
+#define STATIC static
|
|
+#endif
|
|
+
|
|
/* Specification. */
|
|
#include "localcharset.h"
|
|
|
|
--- binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/intl/localcharset.h.orig 2014-07-24 17:46:54.721150000 +0400
|
|
+++ binutils-git-90debf20f4cc4ddd7cfb6356fe0d3876a18604a6/intl/localcharset.h 2014-08-01 23:48:01.816349439 +0400
|
|
@@ -31,7 +31,12 @@
|
|
The result must not be freed; it is statically allocated.
|
|
If the canonical name cannot be determined, the result is a non-canonical
|
|
name. */
|
|
-extern const char * locale_charset (void);
|
|
+#ifdef STATIC
|
|
+STATIC
|
|
+#else
|
|
+extern
|
|
+#endif
|
|
+const char * locale_charset (void);
|
|
|
|
|
|
#ifdef __cplusplus
|