[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

more on patch problem



    It appears the rej I am seeing in trying to build the
current gcc-3.2 packages from source is...

bogus:/home/howarth/debian-gcc32/gcc-3.2-3.2.1ds1/src/libstdc++-v3/src# more Makefile.in.rej
***************
*** 416,422 ****
  installcheck: installcheck-am
  install-info-am: 
  install-info: install-info-am
- install-exec-am: install-toolexeclibLTLIBRARIES
  install-exec: install-exec-am
  
  install-data-am:
--- 416,422 ----
  installcheck: installcheck-am
  install-info-am: 
  install-info: install-info-am
+ install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
  install-exec: install-exec-am
  
  install-data-am:
***************
*** 480,486 ****
  clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
  distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
  dvi-am dvi check check-am installcheck-am installcheck install-info-am \
- install-info install-exec-am install-exec install-data-am install-data \
  install-am install uninstall-am uninstall all-redirect all-am all \
  installdirs mostlyclean-generic distclean-generic clean-generic \
  maintainer-clean-generic clean mostlyclean distclean maintainer-clean
--- 480,486 ----
  clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
  distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
  dvi-am dvi check check-am installcheck-am installcheck install-info-am \
+ install-info install-exec-local install-exec-am install-exec install-data-am install-data \
  install-am install uninstall-am uninstall all-redirect all-am all \
  installdirs mostlyclean-generic distclean-generic clean-generic \
  maintainer-clean-generic clean mostlyclean distclean maintainer-clean
***************
*** 497,502 ****
  	$(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
  concept-inst.o: concept-inst.cc
  	$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
--- 497,506 ----
  	$(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
  concept-inst.o: concept-inst.cc
  	$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+ 
+ install-exec-local:
+ 	$(AR) cru libstdc++_pic.a .libs/*.o ../libsupc++/*.o
+ 	$(INSTALL_DATA) libstdc++_pic.a $(glibcpp_toolexeclibdir)
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.


It looks like these sections are now moved down to around line 453
in the first part of the patch and rearranged enough to be unrecognizable
in both. Any ideas?
                          Jack



Reply to: