Package: gcc-4.2
Version: 4.2-20070707-1
Severity: normal
Patch

As a result of REVERSE_CROSS patch, it breaks regular cross compiler
creation setting DEB_CROSS.

I have tested it and Native, Regular cross and reverse cross now builds.

Patch:

diff -urN gcc-4.2-4.2-20070707/debian/rules2
gcc-4.2-4.2-20070707.cross/debian/rules2
--- gcc-4.2-4.2-20070707/debian/rules2  2007-07-09 17:54:48.000000000 +0200
+++ gcc-4.2-4.2-20070707.cross/debian/rules2    2007-07-09 17:52:52.000000000 
+0200
@@ -542,8 +542,39 @@
        dh_testdir
        rm -f bootstrap-protocol
# DEB_CROSS is never set if REVERSE_CROSS is set and vice-versa.
-ifndef DEB_CROSS
-ifndef REVERSE_CROSS
+ifdef DEB_CROSS
+       : # build cross compiler for $(TARGET_ALIAS)
+       ( \
+         set +e; \
+         PATH=$(PWD)/bin:$$PATH \
+         $(SET_LOCPATH) \
+           $(MAKE) -C $(builddir) $(NJOBS) \
+               CC="$(CC)" \
+               CFLAGS="$(CFLAGS)" \
+               BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
+               ; \
+         echo $$? > status; \
+       ) 2>&1 | tee bootstrap-protocol
+       s=`cat status`; rm -f status; test $$s -eq 0
+else
+ ifdef REVERSE_CROSS
+       : # build cross compiler for $(TARGET_ALIAS)
+       ( \
+         set +e; \
+         PATH=$(PWD)/bin:$$PATH \
+         $(SET_LOCPATH) \
+           $(MAKE) -C $(builddir) $(NJOBS) \
+               CC="$(CC)" \
+               CFLAGS="$(CFLAGS)" \
+               BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
+               ; \
+         echo $$? > status; \
+       ) 2>&1 | tee bootstrap-protocol
+       s=`cat status`; rm -f status; test $$s -eq 0
+ else
+  # Native build
  ifeq ($(with_java),yes)
        mkdir -p bin
        ln -sf /usr/bin/fastjar bin/jar
@@ -604,21 +635,6 @@
          echo $$? > status; \
        ) 2>&1 | tee bootstrap-protocol
        s=`cat status`; rm -f status; test $$s -eq 0
-else
-       : # build cross compiler for $(TARGET_ALIAS)
-       ( \
-         set +e; \
-         PATH=$(PWD)/bin:$$PATH \
-         $(SET_LOCPATH) \
-           $(MAKE) -C $(builddir) $(NJOBS) \
-               CC="$(CC)" \
-               CFLAGS="$(CFLAGS)" \
-               BOOT_CFLAGS="$(BOOT_CFLAGS)" \
-               LDFLAGS="$(LDFLAGS)" \
-               ; \
-         echo $$? > status; \
-       ) 2>&1 | tee bootstrap-protocol
-       s=`cat status`; rm -f status; test $$s -eq 0
endif
endif
        -chmod 755 $(srcdir)/contrib/warn_summary

--
Héctor Orón

Reply via email to