architecture/blackfin/package/gcc/fixincl2.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gcc/fixincl2.patch
   5 # Copyright (C) 2008 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- gcc-4.3.1/gcc/Makefile.in.vanilla   2008-07-19 19:21:58.000000000 +0200
  18 +++ gcc-4.3.1/gcc/Makefile.in   2008-07-19 19:24:39.000000000 +0200
  19 @@ -4085,10 +4085,10 @@
  20         if [ $$? -eq 0 ]; then \
  21           dir=`cd include-fixed; ${PWD_COMMAND}`; \
  22           for i in $$files; do \
  23 -           dest=`ls -ld $(DESTDIR)$(libsubdir)/include-fixed/$$i | sed -n 's/.*-> //p'`; \
  24 +           dest=`ls -ld $(DESTDIR)$(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \
  25             if expr "$$dest" : "$$dir.*" > /dev/null; then \
  26               rm -f $(DESTDIR)$(libsubdir)/include-fixed/$$i; \
  27 -             ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(DESTDIR)$(libsubdir)/include-fixed/$$i; \
  28 +             ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(DESTDIR)$(libsubdir)/include/$$i; \
  29             fi; \
  30           done; \
  31         fi
  32 @@ -4096,9 +4096,6 @@
  33  # Create or recreate the gcc private include file directory.
  34  install-include-dir: installdirs
  35         $(mkinstalldirs) $(DESTDIR)$(libsubdir)/include
  36 -       -rm -rf $(DESTDIR)$(libsubdir)/include-fixed
  37 -       mkdir $(DESTDIR)$(libsubdir)/include-fixed
  38 -       -chmod a+rx $(DESTDIR)$(libsubdir)/include-fixed
  39
  40  # Create or recreate the install-tools include file directory.
  41  itoolsdir = $(libexecsubdir)/install-tools
  42 @@ -4116,7 +4113,7 @@
  43         (cd `${PWD_COMMAND}`/include ; \
  44          tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
  45         (cd `${PWD_COMMAND}`/include-fixed ; \
  46 -        tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - )
  47 +        tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
  48  # /bin/sh on some systems returns the status of the first tar,
  49  # and that can lose with GNU tar which always writes a full block.
  50  # So use `exit 0' to ignore its exit status.
  51 @@ -4127,7 +4124,7 @@
  52         cd `${PWD_COMMAND}`/include ; \
  53         find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
  54         cd `${PWD_COMMAND}`/include-fixed ; \
  55 -       find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include-fixed
  56 +       find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
  57
  58  # Install the include directory using cp.
  59  install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir
  60 @@ -4137,11 +4134,11 @@
  61  # Targets without dependencies, for use in prev-gcc during bootstrap.
  62  real-install-headers-tar:
  63         (cd `${PWD_COMMAND}`/include-fixed ; \
  64 -        tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - )
  65 +        tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
  66
  67  real-install-headers-cpio:
  68         cd `${PWD_COMMAND}`/include-fixed ; \
  69 -       find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include-fixed
  70 +       find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include
  71
  72  real-install-headers-cp:
  73         cp -p -r include-fixed $(DESTDIR)$(libsubdir)