c65fd3a289
Conflicts: lib/spack/spack/cmd/create.py lib/spack/spack/cmd/extensions.py lib/spack/spack/cmd/fetch.py lib/spack/spack/cmd/uninstall.py lib/spack/spack/config.py lib/spack/spack/database.py lib/spack/spack/directory_layout.py lib/spack/spack/packages.py lib/spack/spack/spec.py
53 lines
2.7 KiB
Diff
53 lines
2.7 KiB
Diff
--- binutils-2.24/libiberty/Makefile.in 2013-11-04 10:33:40.000000000 -0500
|
|
+++ binutils-2.24-fixes/libiberty/Makefile.in 2014-10-17 16:22:31.413655000 -0400
|
|
@@ -66,6 +66,7 @@
|
|
MAKEOVERRIDES =
|
|
|
|
TARGETLIB = ./libiberty.a
|
|
+TARGETLIBPIC = ./libiberty_pic.a
|
|
TESTLIB = ./testlib.a
|
|
|
|
LIBOBJS = @LIBOBJS@
|
|
@@ -355,27 +356,27 @@
|
|
# since it will be passed the multilib flags.
|
|
MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
|
|
install_to_libdir: all
|
|
- if test -n "${target_header_dir}"; then \
|
|
- ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
|
|
- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
|
|
- ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
|
|
- mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
|
|
- case "${target_header_dir}" in \
|
|
- /*) thd=${target_header_dir};; \
|
|
- *) thd=${includedir}/${target_header_dir};; \
|
|
- esac; \
|
|
- ${mkinstalldirs} $(DESTDIR)$${thd}; \
|
|
- for h in ${INSTALLED_HEADERS}; do \
|
|
- ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
|
|
- done; \
|
|
- fi
|
|
+ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
|
|
+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
|
|
+ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC)n; \
|
|
+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
|
|
+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIBPIC)n ;$(RANLIB) $(TARGETLIBPIC)n ); \
|
|
+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
|
|
+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC); \
|
|
+ ${mkinstalldirs} $(DESTDIR)$${includedir}; \
|
|
+ for h in ${INSTALLED_HEADERS}; do \
|
|
+ ${INSTALL_DATA} $$h $(DESTDIR)$${includedir}; \
|
|
+ done;
|
|
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
|
|
|
|
install_to_tooldir: all
|
|
${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
|
|
$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
|
|
+ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)n
|
|
( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
|
|
+ ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIBPIC)n; $(RANLIB) $(TARGETLIBPIC)n )
|
|
mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
|
|
+ mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)
|
|
@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
|
|
|
|
# required-list was used when building a shared bfd/opcodes/libiberty
|