Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.5/410-libgcc_eh.a.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com> 
     1 Highly inspired by:

     2   http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch

     3 

     4 diff -durN gcc-4.4.0.orig/libgcc/Makefile.in gcc-4.4.0/libgcc/Makefile.in

     5 --- gcc-4.4.0.orig/libgcc/Makefile.in	2009-04-10 01:23:07.000000000 +0200

     6 +++ gcc-4.4.0/libgcc/Makefile.in	2011-09-12 17:05:25.121124559 +0200

     7 @@ -754,8 +754,9 @@

     8  libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)

     9  endif

    10  

    11 +all: libgcc_eh.a

    12  ifeq ($(enable_shared),yes)

    13 -all: libgcc_eh.a libgcc_s$(SHLIB_EXT)

    14 +all: libgcc_s$(SHLIB_EXT)

    15  ifneq ($(LIBUNWIND),)

    16  all: libunwind$(SHLIB_EXT)

    17  endif

    18 @@ -924,10 +925,6 @@

    19  install-shared:

    20  	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)

    21  

    22 -	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/

    23 -	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    24 -	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    25 -

    26  	$(subst @multilib_dir@,$(MULTIDIR),$(subst \

    27  		@shlib_base_name@,libgcc_s,$(subst \

    28  		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL))))

    29 @@ -942,6 +939,10 @@

    30  	chmod 644 $(DESTDIR)$(inst_libdir)/libgcov.a

    31  	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a

    32  

    33 +	$(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/

    34 +	chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    35 +	$(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a

    36 +

    37  	parts="$(INSTALL_PARTS)";				\

    38  	for file in $$parts; do					\

    39  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
crosstool-ng