pyrox.dev
1diff --git a/bfd/configure.ac b/bfd/configure.ac
2index c5bfbd5d..45ad4c26 100644
3--- a/bfd/configure.ac
4+++ b/bfd/configure.ac
5@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
6
7 LT_LIB_M
8
9-# When building a shared libbfd, link against the pic version of libiberty
10-# so that apps that use libbfd won't need libiberty just to satisfy any
11-# libbfd references.
12-# We can't do that if a pic libiberty is unavailable since including non-pic
13-# code would insert text relocations into libbfd.
14 SHARED_LIBADD=
15-SHARED_LDFLAGS=
16+SHARED_LDFLAGS=-liberty
17 if test "$enable_shared" = "yes"; then
18-changequote(,)dnl
19- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
20-changequote([,])dnl
21- if test -n "$x"; then
22- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
23- fi
24-
25 case "${host}" in
26 # More hacks to build DLLs on Windows.
27 *-*-cygwin*)
28 SHARED_LDFLAGS="-no-undefined"
29- SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
30+ SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32"
31 ;;
32
33 # Use built-in libintl on macOS, since it is not provided by libc.
34 *-*-darwin*)
35- SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl"
36+ SHARED_LIBADD="-liberty -lintl"
37 ;;
38 esac
39
40diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
41index 4f06074a..6836c589 100644
42--- a/opcodes/Makefile.am
43+++ b/opcodes/Makefile.am
44@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir)
45 endif
46
47 # This is where bfd.h lives.
48-BFD_H = ../bfd/bfd.h
49+BFD_H = $(BFDDIR)/bfd.h
50
51 BUILD_LIBS = @BUILD_LIBS@
52 BUILD_LIB_DEPS = @BUILD_LIB_DEPS@
53@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@
54 # development.sh is used to determine -Werror default.
55 CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh
56
57-AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
58+AM_CPPFLAGS = -I. -I$(srcdir) -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ @INCINTL@
59
60 disassemble.lo: disassemble.c
61 if am__fastdepCC
62@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c
63 # old version of libbfd, or to pick up libbfd for the wrong architecture
64 # if host != build. So for building with shared libraries we use a
65 # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la.
66-libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@
67+libopcodes_la_DEPENDENCIES = $(OFILES) @SHARED_DEPENDENCIES@ libtool-soversion
68 libopcodes_la_LIBADD = $(OFILES) @SHARED_LIBADD@
69-libopcodes_la_LDFLAGS += -release `cat ../bfd/libtool-soversion` @SHARED_LDFLAGS@
70+libopcodes_la_LDFLAGS += -release `cat libtool-soversion` @SHARED_LDFLAGS@
71 # Allow dependency tracking to work on all the source files.
72 EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES)
73
74+libtool-soversion:
75+ @echo "creating $@"
76+ bfd_soversion="$(VERSION)" ;\
77+ . $(BFDDIR)/development.sh ;\
78+ if test "$$development" = true ; then \
79+ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
80+ fi ;\
81+ echo "$${bfd_soversion}" > $@
82+
83 # libtool will build .libs/libopcodes.a. We create libopcodes.a in
84 # the build directory so that we don't have to convert all the
85 # programs that use libopcodes.a simultaneously. This is a hack which
86diff --git a/opcodes/configure.ac b/opcodes/configure.ac
87index 00be9c88..6e589ae4 100644
88--- a/opcodes/configure.ac
89+++ b/opcodes/configure.ac
90@@ -86,6 +86,7 @@ AC_PROG_INSTALL
91
92 AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h)
93 ACX_HEADER_STRING
94+GCC_HEADER_STDINT(bfd_stdint.h)
95
96 AC_CHECK_DECLS([basename, stpcpy])
97
98@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed,
99
100 LT_LIB_M
101
102-#Libs for generator progs
103-if test "x$cross_compiling" = "xno"; then
104- BUILD_LIBS=../libiberty/libiberty.a
105- BUILD_LIB_DEPS=$BUILD_LIBS
106-else
107- # if cross-compiling, assume that the system provides -liberty
108- # and that the version is compatible with new headers.
109- BUILD_LIBS=-liberty
110- BUILD_LIB_DEPS=
111-fi
112-BUILD_LIBS="$BUILD_LIBS $LIBINTL"
113-BUILD_LIB_DEPS="$BUILD_LIB_DEPS $LIBINTL_DEP"
114+BUILD_LIBS="-liberty $LIBINTL"
115+BUILD_LIB_DEPS="$LIBINTL_DEP"
116
117 AC_SUBST(BUILD_LIBS)
118 AC_SUBST(BUILD_LIB_DEPS)
119
120 # Horrible hacks to build DLLs on Windows and a shared library elsewhere.
121 SHARED_LDFLAGS=
122-SHARED_LIBADD=
123+SHARED_LIBADD=-liberty
124 SHARED_DEPENDENCIES=
125 if test "$enable_shared" = "yes"; then
126-# When building a shared libopcodes, link against the pic version of libiberty
127-# so that apps that use libopcodes won't need libiberty just to satisfy any
128-# libopcodes references.
129-# We can't do that if a pic libiberty is unavailable since including non-pic
130-# code would insert text relocations into libopcodes.
131 # Note that linking against libbfd as we do here, which is itself linked
132 # against libiberty, may not satisfy all the libopcodes libiberty references
133 # since libbfd may not pull in the entirety of libiberty.
134-changequote(,)dnl
135- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
136-changequote([,])dnl
137- if test -n "$x"; then
138- SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
139- fi
140-
141 case "${host}" in
142 *-*-cygwin*)
143 SHARED_LDFLAGS="-no-undefined"
144- SHARED_LIBADD="-L`pwd`/../bfd -lbfd -L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin"
145+ SHARED_LIBADD="-lbfd -liberty -lintl -lcygwin"
146 ;;
147- *-*-darwin*)
148- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.dylib ${SHARED_LIBADD}"
149- SHARED_DEPENDENCIES="../bfd/libbfd.la"
150- ;;
151 *)
152- case "$host_vendor" in
153- hp)
154- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl ${SHARED_LIBADD}"
155- ;;
156- *)
157- SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so ${SHARED_LIBADD}"
158- ;;
159- esac
160- SHARED_DEPENDENCIES="../bfd/libbfd.la"
161+ SHARED_LIBADD="-lbfd ${SHARED_LIBADD}"
162 ;;
163 esac
164