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

Fixes for cross-gcc build



Hello.

Recently I've got a bug report about cross-gcc build failure for powerpc 
target. I fixed that.
Could you please apply the attached patches to gcc-3.3 and gcc-3.4 source 
packages?

Nikita

P.S.
Is it possible for me to get commit acces to the repository of gcc source 
packages, so I could commit future fixes without bothering you?
diff -urN debian.orig/control.m4 debian/control.m4
--- debian.orig/control.m4	2004-05-29 23:09:10.000000000 +0400
+++ debian/control.m4	2004-05-29 23:19:10.000000000 +0400
@@ -36,7 +36,7 @@
 Uploaders: Matthias Klose <doko@debian.org>, Gerhard Tonn <gt@debian.org>
 Standards-Version: 3.6.1
 ifdef(`TARGET',`dnl cross
-Build-Depends: LIBC_BUILD_DEP, m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dpkg-cross, binutils`'TS
+Build-Depends: LIBC_BUILD_DEP, m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dpkg-cross (>= 1.14.5), binutils`'TS
 ',`dnl native
 Build-Depends: LIBC_BUILD_DEP, libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], m4, autoconf2.13, automake1.4 | automake (<< 1.5), libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [check_no_archs], expect (>= 5.38.0) [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 [hppa], debhelper (>= 3.0.25), gperf (>= 2.7-3), bison (>= 1:1.875a-1) | bison (<< 1:1.50), flex-old | flex (<< 2.5.31), gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [libgc_no_archs], xlibs-dev, gnat-3.3 [ada_no_archs] | gnat-3.2 [ada_no_archs] | gnat [i386 powerpc sparc], libncurses5-dev [pascal_no_archs], libgmp3-dev, tetex-bin [pascal_no_archs], locales [locale_no_archs !hurd-i386], gcc-2.95 [m68k], procps [check_no_archs], help2man, sharutils
 Build-Depends-Indep: doxygen (>= 1.3.6.20040222)
diff -urN debian.orig/README.cross debian/README.cross
--- debian.orig/README.cross	2004-05-29 23:09:10.000000000 +0400
+++ debian/README.cross	2004-05-29 23:18:21.000000000 +0400
@@ -41,6 +41,11 @@
 The resulting library packages follow the same convensions as library packages
 converted by dpkg-cross.
 
+Note that dpkg-shlibdeps wrapper provided by dpkg-cross used to have a bug that
+caused cross-compiler build to fail if libgcc1-$(TARGET)-cross package is not
+installed. This bug was fixed in (unofficial) version 1.14.5 of dpkg-cross,
+currently available from http://zigzag.lvk.cs.msu.su/~nikita/debian/.
+
 1.2. kernel-headers package for the target architecture
 
 It is not recommended to use kernel-headers for the host architecture,
@@ -48,6 +53,8 @@
 
 The easiest way is to convert kernel-headers debian package for the target
 architecture using dpkg-cross, and install the resulting package.
+Unfortunately, dpkg-cross versions prior to (unofficial) 1.14.1 failed
+to process linux-kernel-headers package, so please use newer versions.
 
 1.3. libc for the target architecture
 
diff -urN debian.orig/rules2 debian/rules2
--- debian.orig/rules2	2004-05-29 23:09:10.000000000 +0400
+++ debian/rules2	2004-05-29 23:09:28.000000000 +0400
@@ -884,8 +884,10 @@
   include debian/rules.d/binary-libstdcxx-cross.mk
 endif
 
-ifeq ($(DEB_TARGET_ARCH),powerpc)
-  include debian/rules.d/binary-nof-cross.mk
+ifeq ($(with_libnof), yes)
+  ifeq ($(DEB_TARGET_ARCH),powerpc)
+    include debian/rules.d/binary-nof-cross.mk
+  endif
 endif
 
 ifeq ($(with_cdev),yes)
diff -urN debian.orig/control.m4 debian/control.m4
--- debian.orig/control.m4	2004-05-29 23:23:57.000000000 +0400
+++ debian/control.m4	2004-05-29 23:22:53.000000000 +0400
@@ -36,7 +36,7 @@
 Uploaders: Matthias Klose <doko@debian.org>, Gerhard Tonn <gt@debian.org>
 Standards-Version: 3.6.1
 ifdef(`TARGET',`dnl cross
-Build-Depends: LIBC_BUILD_DEP, m4, autoconf2.13, automake1.7, libtool, autotools-dev, gawk, dpkg-cross, binutils`'TS
+Build-Depends: LIBC_BUILD_DEP, m4, autoconf2.13, automake1.7, libtool, autotools-dev, gawk, dpkg-cross (>= 1.14.5), binutils`'TS
 ',`dnl native
 Build-Depends: LIBC_BUILD_DEP, libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390], m4, autoconf2.13, autoconf, automake1.4, automake1.7, libtool, autotools-dev, gawk, dejagnu (>= 1.4.3) [check_no_archs], expect (>= 5.38.0) [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 [hppa], debhelper (>= 4.1), gperf (>= 2.7-3), bison (>= 1:1.875a-1) | bison (<< 1:1.50), flex, gettext, texinfo (>= 4.3), zlib1g-dev, libgc-dev [libgc_no_archs], xlibs-dev, gnat-3.3 [ada_no_archs] | gnat-3.4 [ada_no_archs] | gnat [i386 powerpc sparc], libncurses5-dev [pascal_no_archs], libgmp3-dev, tetex-bin [pascal_no_archs], locales [locale_no_archs !hurd-i386], gcc-2.95 [m68k], procps [check_no_archs], help2man [pascal_no_archs], sharutils, libgtk2.0-dev [java_no_archs], libart-2.0-dev [java_no_archs], g++-3.3, g77-3.3, gobjc-3.3
 Build-Depends-Indep: doxygen (>= 1.3.7)
diff -urN debian.orig/README.cross debian/README.cross
--- debian.orig/README.cross	2004-05-29 23:23:57.000000000 +0400
+++ debian/README.cross	2004-05-29 23:21:52.000000000 +0400
@@ -41,6 +41,11 @@
 The resulting library packages follow the same convensions as library packages
 converted by dpkg-cross.
 
+Note that dpkg-shlibdeps wrapper provided by dpkg-cross used to have a bug that
+caused cross-compiler build to fail if libgcc1-$(TARGET)-cross package is not
+installed. This bug was fixed in (unofficial) version 1.14.5 of dpkg-cross,
+currently available from http://zigzag.lvk.cs.msu.su/~nikita/debian/.
+
 1.2. kernel-headers package for the target architecture
 
 It is not recommended to use kernel-headers for the host architecture,
@@ -48,6 +53,8 @@
 
 The easiest way is to convert kernel-headers debian package for the target
 architecture using dpkg-cross, and install the resulting package.
+Unfortunately, dpkg-cross versions prior to (unofficial) 1.14.1 failed
+to process linux-kernel-headers package, so please use newer versions.
 
 1.3. libc for the target architecture
 
diff -urN debian.orig/rules2 debian/rules2
--- debian.orig/rules2	2004-05-29 23:23:57.000000000 +0400
+++ debian/rules2	2004-05-29 23:21:52.000000000 +0400
@@ -790,8 +790,10 @@
   include debian/rules.d/binary-libstdcxx-cross.mk
 endif
 
-ifeq ($(DEB_TARGET_ARCH),powerpc)
-  include debian/rules.d/binary-nof-cross.mk
+ifeq ($(with_libnof), yes)
+  ifeq ($(DEB_TARGET_ARCH),powerpc)
+    include debian/rules.d/binary-nof-cross.mk
+  endif
 endif
 
 ifeq ($(with_cdev),yes)

Reply to: