Patchwork [libgcc,build] cater for static archives as 'extra parts'

login
register
mail settings
Submitter IainS
Date Sept. 18, 2010, 3:32 p.m.
Message ID <B303DD31-F2B7-42C3-816F-4C7659038ADE@sandoe-acoustics.co.uk>
Download mbox | patch
Permalink /patch/65129/
State New
Headers show

Comments

IainS - Sept. 18, 2010, 3:32 p.m.
On 15 Sep 2010, at 16:52, Paolo Bonzini wrote:

> On 09/15/2010 05:51 PM, IainS wrote:
>> Index: libgcc/Makefile.in
>> ===================================================================
>> --- libgcc/Makefile.in (revision 164304)
>> +++ libgcc/Makefile.in (working copy)
>> @@ -870,6 +870,9 @@ endif
>> for file in $$parts; do \
>> rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>> $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/; \
>> + if [ $${file##*.} = "a" ] ; then \
>> + $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>> + fi; \
>
> Please use "case", ${file##*.} is a bashism.

Is this OK?
Iain
Paolo Bonzini - Sept. 18, 2010, 7:43 p.m.
On 09/18/2010 05:32 PM, IainS wrote:
>
> On 15 Sep 2010, at 16:52, Paolo Bonzini wrote:
>
>> On 09/15/2010 05:51 PM, IainS wrote:
>>> Index: libgcc/Makefile.in
>>> ===================================================================
>>> --- libgcc/Makefile.in (revision 164304)
>>> +++ libgcc/Makefile.in (working copy)
>>> @@ -870,6 +870,9 @@ endif
>>> for file in $$parts; do \
>>> rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>> $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/; \
>>> + if [ $${file##*.} = "a" ] ; then \
>>> + $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>> + fi; \
>>
>> Please use "case", ${file##*.} is a bashism.
>
> Is this OK?

Yes, thanks.

Paolo
IainS - Sept. 21, 2010, 2:45 p.m.
On 18 Sep 2010, at 20:43, Paolo Bonzini wrote:

> On 09/18/2010 05:32 PM, IainS wrote:
>>
>> On 15 Sep 2010, at 16:52, Paolo Bonzini wrote:
>>
>>> On 09/15/2010 05:51 PM, IainS wrote:
>>>> Index: libgcc/Makefile.in
>>>> ===================================================================
>>>> --- libgcc/Makefile.in (revision 164304)
>>>> +++ libgcc/Makefile.in (working copy)
>>>> @@ -870,6 +870,9 @@ endif
>>>> for file in $$parts; do \
>>>> rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>>> $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/; \
>>>> + if [ $${file##*.} = "a" ] ; then \
>>>> + $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file; \
>>>> + fi; \
>>>
>>> Please use "case", ${file##*.} is a bashism.
>>
>> Is this OK?
>
> Yes, thanks.

r164482
Iain

Patch

Index: libgcc/Makefile.in
===================================================================
--- libgcc/Makefile.in	(revision 164393)
+++ libgcc/Makefile.in	(working copy)
@@ -870,6 +870,10 @@  endif
  	for file in $$parts; do					\
  	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
  	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+	  case $$file in 					\
+	    *.a)						\
+	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+	  esac;							\
  	done

  # Build extra startfiles in the gcc directory, for unconverted
@@ -903,6 +907,10 @@  gcc-extra-parts:
  	for file in $$parts; do					\
  	  rm -f $(gcc_objdir)$(MULTISUBDIR)/$$file;		\
  	  $(INSTALL_DATA) $$file $(gcc_objdir)$(MULTISUBDIR)/;	\
+	  case $$file in 					\
+	    *.a)						\
+	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+	  esac;							\
  	done

  all: $(extra-parts)
@@ -958,6 +966,10 @@  install-leaf: $(install-shared) $(install-libunwin
  	for file in $$parts; do					\
  	  rm -f $(DESTDIR)$(inst_libdir)/$$file;		\
  	  $(INSTALL_DATA) $$file $(DESTDIR)$(inst_libdir)/;	\
+	  case $$file in 					\
+	    *.a)						\
+	      $(RANLIB) $(gcc_objdir)$(MULTISUBDIR)/$$file ;;	\
+	  esac;							\
  	done

  install: install-leaf