debian/rules: force using gcc-4.2 on arm (fix FTBFS on arm)

diff --git a/debian/changelog b/debian/changelog
index d958e0de9d69b3957e0f057817583bcf157358dc..ab00dc5a519b1242a892c50b8df9ec618b82c0c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-ocaml (3.10.2-3) UNRELEASED; urgency=low
+ocaml (3.10.2-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/rules: force using gcc-4.2 on arm (fix FTBFS on arm)
 
- -- Stefano Zacchiroli <zack@debian.org>  Sun, 18 May 2008 23:00:10 +0200
+ -- Stefano Zacchiroli <zack@debian.org>  Mon, 19 May 2008 23:22:08 +0200
 
 ocaml (3.10.2-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index ef0065097214592313c5693cca6783ede47f887a..8d77d2cf37d4e68b26dfa084d7c221cbeb7aac36 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Sven Luther <luther@debian.org>, Stefano Zacchiroli <zack@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>, Samuel Mimram <smimram@debian.org>, Sylvain Le Gall <gildor@debian.org>
-Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
+Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm]
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/
@@ -11,7 +11,7 @@ Homepage: http://caml.inria.fr/
 
 Package: ocaml-nox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc, binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils
 Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
 Recommends: camlp4, ledit, file
 Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -137,7 +137,7 @@ Description: Runtime system for OCaml bytecode executables
 
 Package: ocaml-native-compilers
 Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
-Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (= ${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils, ${shlibs:Depends}, ${misc:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)
 Description: Native code compilers of the OCaml suite (the .opt ones)

diff --git a/debian/control.in b/debian/control.in
index b4d927b5e88ae9a022e990bf33eca15358578abe..9ec61757ca72b7c16f3dafb1957181b595c57bfe 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Sven Luther <luther@debian.org>, Stefano Zacchiroli <zack@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>, Samuel Mimram <smimram@debian.org>, Sylvain Le Gall <gildor@debian.org>
-Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
+Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils, gcc-4.2 [arm]
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/
@@ -11,7 +11,7 @@ Homepage: http://caml.inria.fr/
 
 Package: ocaml-nox
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc, binutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5-dev, ocaml-base-nox (=${binary:Version}), ocaml-interp (=${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils
 Suggests: ocaml-doc, libgdbm-dev, tuareg-mode | ocaml-mode
 Recommends: camlp4, ledit, file
 Provides: ocaml-nox-${F:OCamlABI}, ${F:BestProvides}, libnums-ocaml-dev
@@ -137,7 +137,7 @@ Description: Runtime system for OCaml bytecode executables
 
 Package: ocaml-native-compilers
 Architecture: #OcamlNativeArchs#
-Depends: ocaml-nox (= ${binary:Version}), gcc, binutils, ${shlibs:Depends}, ${misc:Depends}
+Depends: ocaml-nox (= ${binary:Version}), gcc [!arm], gcc-4.2 [arm], binutils, ${shlibs:Depends}, ${misc:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)
 Description: Native code compilers of the OCaml suite (the .opt ones)

diff --git a/debian/rules b/debian/rules
index 6605b8cbac4e4b2781aae0b894d2ad6814ffe9b2..98c334b6f1da0d357996af11b2a15daa44602603 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,9 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
+ifeq (arm,$(DEB_BUILD_ARCH))
+CFG_CC_FLAGS = -cc gcc-4.2
+endif
 
 abi-sed:
        for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
@@ -64,7 +67,7 @@ debian/$(SRCTARBALL):
 
 config-stamp: pre-config patch-stamp abi-sed
        dh_testdir
-       ./configure --with-pthread -prefix /usr                         \
+       ./configure --with-pthread -prefix /usr $(CFG_CC_FLAGS)         \
                -libdir /usr/lib/ocaml/$(OCAMLABI)                      \
                -mandir /usr/share/man                                  \
                -tkdefs "-I/usr/include/tcl8.4"                         \