Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.2/400-libgcc_eh.a.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 Highly inspired by:

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

     3 

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

     5 --- gcc-4.3.2.orig//libgcc/Makefile.in	2008-06-17 11:32:34.000000000 +0200

     6 +++ gcc-4.3.2/libgcc/Makefile.in	2011-09-02 12:27:39.296538955 +0200

     7 @@ -705,8 +705,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 @@ -875,10 +876,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 @@ -893,6 +890,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