Remove some old clutter from debian/rules2 and debian/rules.patch (please review before approving, of course)
-- Ludovic Brenta. --- rules.defs~ +++ rules.defs Sun Apr 9 16:49:15 2006 +0200 @@ -300,18 +300,15 @@ endif endif ifeq ($(with_java),yes) with_libgcj := yes + enabled_languages += java + ifdef DEB_CROSS + with_fastjar := disabled for cross compiler package + else + with_fastjar := yes + endif else with_libgcj := no -endif - -ifeq ($(with_java),yes) - enabled_languages += java -endif - -# fastjar ------------------- -with_fastjar := yes -ifdef DEB_CROSS - with_fastjar := disabled for cross compiler package + with_fastjar := no endif # libmudflap ------------------- --- rules2~ +++ rules2 Sun Apr 9 16:49:15 2006 +0200 @@ -490,67 +489,6 @@ endif $(srcdir)/contrib/warn_summary bootstrap-protocol \ > bootstrap-summary; \ fi - -ifneq ($(PKGSOURCE),gcc-snapshot) -ifeq ($(with_ada),yesDISABLED) - ifeq ($(with_libgnat),yes) - # In 3.3, the Ada part of GCC does not support parallel builds, - # don't pass the \$(NJOBS) parameter from the make command lines. - - # doesn't work, when the gnatlib-shared-dual target is used ... - ifneq ($(with_libgnat_shared_dual),yes) - -# # Build the static and shared libraries -# rm -f $(builddir)/gcc/ada/rts/*.{o,ali} -# LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir)/gcc/ada/rts \ -# PATH=$(PWD)/bin:$$PATH \ -# $(MAKE) -C $(builddir)/gcc gnatlib-shared \ -# LIBRARY_VERSION=$(GNAT_SONAME) - mkdir -p $(builddir)/gcc/ada/rts/obj - - # Move the object files away lest the tools include them in their - # executables. We want to link against libgnat.so instead. - mv $(builddir)/gcc/ada/rts/*.o $(builddir)/gcc/ada/rts/obj - ln -sf libgnat-$(GNAT_SONAME).so.1 \ - $(builddir)/gcc/ada/rts/libgnat-$(BASE_VERSION).so - ln -sf libgnarl-$(GNAT_SONAME).so.1 \ - $(builddir)/gcc/ada/rts/libgnarl-$(BASE_VERSION).so - ln -sf libgnat-$(GNAT_SONAME).so.1 $(builddir)/gcc/ada/rts/libgnat.so - ln -sf libgnarl-$(GNAT_SONAME).so.1 $(builddir)/gcc/ada/rts/libgnarl.so - - # Build gnatmake and gnatlink. - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir)/gcc/ada/rts \ - PATH=$(PWD)/bin:$$PATH \ - $(MAKE) -C $(builddir)/gcc/ada \ - ADA_INCLUDES="-I- -I../rts" \ - CC="../../xgcc -B../../" \ - CFLAGS="-O2" \ - GNATMAKE="../../gnatmake" \ - GNATLINK="../../gnatlink" \ - GNATBIND="../../gnatbind -C" \ - STAGE_PREFIX="../../" \ - LIBGNAT="-L../rts -lgnat" \ - LN_S="ln -sf" \ - gnattools1 - - # Use gnatmake, gnatbind and gnatlink to build the other tools. - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir)/gcc/ada/rts \ - PATH=$(PWD)/bin:$$PATH \ - $(MAKE) -C $(builddir)/gcc/ada \ - ADA_INCLUDES="-I- -I../rts" \ - CC="../../xgcc -B../../" \ - CFLAGS="-O2" \ - GNATMAKE="../../gnatmake" \ - GNATLINK="../../gnatlink" \ - GNATBIND="../../gnatbind" \ - STAGE_PREFIX="../../" \ - LIBGNAT="-L../rts -lgnat" \ - LN_S="ln -sf" \ - gnattools2 - endif - endif -endif -endif # ifneq ($(PKGSOURCE),gcc-snapshot) ifeq ($(biarch),yes) ifeq ($(with_cxx),yes) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]