cirros-testvm/src-cirros/buildroot-2015.05/package/binutils/arc-2014.12/0001-PR-other-56780.patch

   1 From 7827cdf59a1894abe18aa20043a63c8c875c3fce Mon Sep 17 00:00:00 2001
   2 From: DJ Delorie <dj@redhat.com>
   3 Date: Sat, 1 Jun 2013 01:01:44 +0000
   4 Subject: [PATCH] PR other/56780 merge from gcc
   5
   6 binutils-gdb upstream a4818a052efb4cea976a03a2f7cb0b38b23d12d0
   7
   8 libiberty: fix --enable-install-libiberty flag [PR 56780]
   9
  10 Commit 199570 fixed the --disable-install-libiberty behavior, but it also
  11 added a bug where the enable path never works because the initial clear
  12 of target_header_dir wasn't deleted.  So we end up initializing properly
  13 at the top only to reset it at the end all the time.
  14
  15 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
  16
  17 [Romain
  18   rename patch name
  19   squash the two upstream commits
  20   Remove the ChangeLog]
  21 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
  22 ---
  23  libiberty/Makefile.in  | 24 ++++++++++-----------
  24  libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
  25  libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
  26  3 files changed, 68 insertions(+), 60 deletions(-)
  27
  28 diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
  29 index 0a5da31..4f40c72 100644
  30 --- a/libiberty/Makefile.in
  31 +++ b/libiberty/Makefile.in
  32 @@ -354,19 +354,19 @@ install-strip: install
  33  # since it will be passed the multilib flags.
  34  MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
  35  install_to_libdir: all
  36 -       ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
  37 -       $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
  38 -       ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
  39 -       mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
  40         if test -n "${target_header_dir}"; then \
  41 -         case "${target_header_dir}" in \
  42 -           /*)    thd=${target_header_dir};; \
  43 -           *)     thd=${includedir}/${target_header_dir};; \
  44 -         esac; \
  45 -         ${mkinstalldirs} $(DESTDIR)$${thd}; \
  46 -         for h in ${INSTALLED_HEADERS}; do \
  47 -           ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
  48 -         done; \
  49 +               ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
  50 +               $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
  51 +               ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
  52 +               mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
  53 +               case "${target_header_dir}" in \
  54 +                 /*)    thd=${target_header_dir};; \
  55 +                 *)     thd=${includedir}/${target_header_dir};; \
  56 +               esac; \
  57 +               ${mkinstalldirs} $(DESTDIR)$${thd}; \
  58 +               for h in ${INSTALLED_HEADERS}; do \
  59 +                 ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
  60 +               done; \
  61         fi
  62         @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
  63
  64 diff --git a/libiberty/configure b/libiberty/configure
  65 index 6e98352..44d1f78 100755
  66 --- a/libiberty/configure
  67 +++ b/libiberty/configure
  68 @@ -675,8 +675,8 @@ with_cross_host
  69  with_newlib
  70  enable_maintainer_mode
  71  enable_multilib
  72 -enable_largefile
  73  enable_install_libiberty
  74 +enable_largefile
  75  '
  76        ac_precious_vars='build_alias
  77  host_alias
  78 @@ -1303,8 +1303,8 @@ Optional Features:
  79                            enable make rules and dependencies not useful
  80                            (and sometimes confusing) to the casual installer
  81    --enable-multilib       build many library versions (default)
  82 +  --enable-install-libiberty       Install headers and library for end users
  83    --disable-largefile     omit support for large files
  84 -  --enable-install-libiberty       Install headers for end users
  85
  86  Optional Packages:
  87    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  88 @@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
  89     cross_compiling=maybe
  90  fi
  91
  92 +# We may wish to install the target headers somewhere.
  93 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
  94 +$as_echo_n "checking whether to install libiberty headers and static library... " >&6; }
  95 +
  96 +# Check whether --enable-install-libiberty was given.
  97 +if test "${enable_install_libiberty+set}" = set; then :
  98 +  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
  99 +else
 100 +  enable_install_libiberty=no
 101 +fi
 102 +
 103 +# Option parsed, now set things appropriately.
 104 +case x"$enable_install_libiberty" in
 105 +  xyes|x)
 106 +    target_header_dir=libiberty
 107 +    ;;
 108 +  xno)
 109 +    target_header_dir=
 110 +    ;;
 111 +  *)
 112 +    # This could be sanity-checked in various ways...
 113 +    target_header_dir="${enable_install_libiberty}"
 114 +    ;;
 115 +esac
 116 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5
 117 +$as_echo "$enable_install_libiberty" >&6; }
 118 +{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5
 119 +$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;}
 120 +
 121
 122  ac_ext=c
 123  ac_cpp='$CPP $CPPFLAGS'
 124 @@ -5475,7 +5504,6 @@ fi
 125
 126  setobjs=
 127  CHECK=
 128 -target_header_dir=
 129  if test -n "${with_target_subdir}"; then
 130
 131    # We are being configured as a target library.  AC_REPLACE_FUNCS
 132 @@ -5752,29 +5780,6 @@ _ACEOF
 133
 134    esac
 135
 136 -  # We may wish to install the target headers somewhere.
 137 -  # Check whether --enable-install-libiberty was given.
 138 -if test "${enable_install_libiberty+set}" = set; then :
 139 -  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
 140 -else
 141 -  enable_install_libiberty=no
 142 -fi
 143 -
 144 -  # Option parsed, now set things appropriately.
 145 -  case x"$enable_install_libiberty" in
 146 -    xyes|x)
 147 -      target_header_dir=libiberty
 148 -      ;;
 149 -    xno)
 150 -      target_header_dir=
 151 -      ;;
 152 -    *)
 153 -      # This could be sanity-checked in various ways...
 154 -      target_header_dir="${enable_install_libiberty}"
 155 -      ;;
 156 -  esac
 157 -
 158 -
 159  else
 160
 161     # Not a target library, so we set things up to run the test suite.
 162 diff --git a/libiberty/configure.ac b/libiberty/configure.ac
 163 index 754b66a..04260ec 100644
 164 --- a/libiberty/configure.ac
 165 +++ b/libiberty/configure.ac
 166 @@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
 167     cross_compiling=maybe
 168  fi
 169
 170 +# We may wish to install the target headers somewhere.
 171 +AC_MSG_CHECKING([whether to install libiberty headers and static library])
 172 +dnl install-libiberty is disabled by default
 173 +
 174 +AC_ARG_ENABLE(install-libiberty,
 175 +[  --enable-install-libiberty       Install headers and library for end users],
 176 +enable_install_libiberty=$enableval,
 177 +enable_install_libiberty=no)dnl
 178 +
 179 +# Option parsed, now set things appropriately.
 180 +case x"$enable_install_libiberty" in
 181 +  xyes|x)
 182 +    target_header_dir=libiberty
 183 +    ;;
 184 +  xno)
 185 +    target_header_dir=
 186 +    ;;
 187 +  *)
 188 +    # This could be sanity-checked in various ways...
 189 +    target_header_dir="${enable_install_libiberty}"
 190 +    ;;
 191 +esac
 192 +AC_MSG_RESULT($enable_install_libiberty)
 193 +AC_MSG_NOTICE([target_header_dir = $target_header_dir])
 194 +
 195  GCC_NO_EXECUTABLES
 196  AC_PROG_CC
 197  AC_SYS_LARGEFILE
 198 @@ -379,7 +404,6 @@ fi
 199
 200  setobjs=
 201  CHECK=
 202 -target_header_dir=
 203  if test -n "${with_target_subdir}"; then
 204
 205    # We are being configured as a target library.  AC_REPLACE_FUNCS
 206 @@ -490,27 +514,6 @@ if test -n "${with_target_subdir}"; then
 207
 208    esac
 209
 210 -  # We may wish to install the target headers somewhere.
 211 -  AC_ARG_ENABLE(install-libiberty,
 212 -  [  --enable-install-libiberty       Install headers for end users],
 213 -  enable_install_libiberty=$enableval,
 214 -  enable_install_libiberty=no)dnl
 215 -
 216 -  # Option parsed, now set things appropriately.
 217 -  case x"$enable_install_libiberty" in
 218 -    xyes|x)
 219 -      target_header_dir=libiberty
 220 -      ;;
 221 -    xno)
 222 -      target_header_dir=
 223 -      ;;
 224 -    *)
 225 -      # This could be sanity-checked in various ways...
 226 -      target_header_dir="${enable_install_libiberty}"
 227 -      ;;
 228 -  esac
 229 -
 230 -
 231  else
 232
 233     # Not a target library, so we set things up to run the test suite.
 234 --
 235 1.9.3
 236