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

Bug#333951: with_libnof logic inverted for cross-compilation



Package: gcc-4.0
Version: 4.0.2-2
Tags: patch

The logic for disabling nof is inconsistent between regular builds and
cross-compiler builds:

ifndef DEB_CROSS
...
ifeq ($(with_libnof),yes)
  ifeq ($(DEB_TARGET_GNU_CPU),powerpc)
    include debian/rules.d/binary-nof.mk
  endif
endif
...
else
...
ifneq ($(with_libnof),yes)
  ifeq ($(DEB_TARGET_GNU_CPU),powerpc)
    include debian/rules.d/binary-nof-cross.mk
  endif
endif
...
endif

Note that on powerpc-targetted cross-compiles, binary-nof-cross.mk is
included if it is *not* the case that with_libnof is yes.  This causes a
build failure, since binary-nof-cross.mk attempts to construct a package
from files that weren't built.  The attached patch fixes this problem.

- Josh Triplett
diff -Naur gcc-4.0-4.0.2.orig/debian/rules2 gcc-4.0-4.0.2/debian/rules2
--- gcc-4.0-4.0.2.orig/debian/rules2	2005-10-14 03:40:30.000000000 -0700
+++ gcc-4.0-4.0.2/debian/rules2	2005-10-14 04:09:40.000000000 -0700
@@ -1066,7 +1066,7 @@
   include debian/rules.d/binary-libstdcxx-cross.mk
 endif
 
-ifneq ($(with_libnof),yes)
+ifeq ($(with_libnof),yes)
   ifeq ($(DEB_TARGET_GNU_CPU),powerpc)
     include debian/rules.d/binary-nof-cross.mk
   endif

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: