Source of 851-PR-other-56780.patch - buildroot

Raw file
Source viewDiff to previous
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
 
From afe990251bd9b3a063f03da31a3b8d139d033bc3 Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 1 Jun 2013 00:20:49 +0000
Subject: [PATCH] PR other/56780
​
* libiberty/configure.ac: Move test for --enable-install-libiberty
outside of the 'with_target_subdir' test so that it actually gets
run.  Add output messages to show the test result.
* libiberty/configure: Regenerate.
* libiberty/Makefile.in (install_to_libdir): Place the
installation of the libiberty library in the same guard as that
used for the headers to prevent it being installed unless
requested via --enable-install-libiberty.
​
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4
​
libiberty: fix --enable-install-libiberty flag [PR 56780]
​
Commit 199570 fixed the --disable-install-libiberty behavior, but it also
added a bug where the enable path never works because the initial clear
of target_header_dir wasn't deleted.  So we end up initializing properly
at the top only to reset it at the end all the time.
​
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
​
[Romain
  squash the two upstream commits
  Remove the ChangeLog]
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 libiberty/Makefile.in  | 24 ++++++++++-----------
 libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
 libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
 3 files changed, 68 insertions(+), 60 deletions(-)
​
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index f6a3ebd..75ff82d 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -355,19 +355,19 @@ install-strip: install
 # since it will be passed the multilib flags.
 MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
 install_to_libdir: all
-   ${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)
    if test -n "${target_header_dir}"; then \
-     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; \
+       ${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};; \