[Pkg-ocaml-maint-commits] r5663 - in /trunk/packages/ocaml/trunk/debian: changelog control control.in rules
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Mon May 19 21:23:16 UTC 2008
Author: zack
Date: Mon May 19 21:23:15 2008
New Revision: 5663
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5663
Log:
debian/rules: force using gcc-4.2 on arm (fix FTBFS on arm)
Modified:
trunk/packages/ocaml/trunk/debian/changelog
trunk/packages/ocaml/trunk/debian/control
trunk/packages/ocaml/trunk/debian/control.in
trunk/packages/ocaml/trunk/debian/rules
Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=5663&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Mon May 19 21:23:15 2008
@@ -1,8 +1,8 @@
-ocaml (3.10.2-3) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Stefano Zacchiroli <zack at debian.org> Sun, 18 May 2008 23:00:10 +0200
+ocaml (3.10.2-3) unstable; urgency=low
+
+ * debian/rules: force using gcc-4.2 on arm (fix FTBFS on arm)
+
+ -- Stefano Zacchiroli <zack at debian.org> Mon, 19 May 2008 23:22:08 +0200
ocaml (3.10.2-2) unstable; urgency=low
Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=5663&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Mon May 19 21:23:15 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at 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 @@
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 @@
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)
Modified: trunk/packages/ocaml/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control.in?rev=5663&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control.in (original)
+++ trunk/packages/ocaml/trunk/debian/control.in Mon May 19 21:23:15 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at 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 @@
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 @@
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)
Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=5663&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Mon May 19 21:23:15 2008
@@ -34,6 +34,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:
@@ -64,7 +67,7 @@
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" \
More information about the Pkg-ocaml-maint-commits
mailing list