[Pkg-ocaml-maint-commits] r2292 - trunk/packages/ocaml/trunk/debian

[Julien Cristau]

Author: jcristau-guest
Date: 2005-12-15 17:02:02 +0000 (Thu, 15 Dec 2005)
New Revision: 2292

Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/control
   trunk/packages/ocaml/trunk/debian/rules
Log:
Stop building the native compilers on hppa, they are buggy and upstream
considers this port dead (see bug#342704).


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-12-13 01:02:52 UTC (rev 2291)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-12-15 17:02:02 UTC (rev 2292)
@@ -3,12 +3,14 @@
   [ Julien Cristau ]
   * debian/rules: the abi-sed rule is phony, we don't want to run configure
     twice.
+  * Stop building the native compilers on hppa, they are buggy and upstream
+    considers this port dead (see bug#342704).
 
   [ Samuel Mimram ]
   * Added for_pack_static.dpatch (from CVS) to correct a bug when linking.
   * Added myself to uploaders.
 
- -- Samuel Mimram <smimram at debian.org>  Sun, 11 Dec 2005 19:13:13 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Thu, 15 Dec 2005 17:55:22 +0100
 
 ocaml (3.09.0-3) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/control
===================================================================
--- trunk/packages/ocaml/trunk/debian/control	2005-12-13 01:02:52 UTC (rev 2291)
+++ trunk/packages/ocaml/trunk/debian/control	2005-12-15 17:02:02 UTC (rev 2292)
@@ -95,7 +95,7 @@
  you do not require any graphical capilities for your runtime.
 
 Package: ocaml-native-compilers
-Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc
+Architecture: alpha amd64 arm hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc
 Depends: ocaml-nox (= ${Source-Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}
 Provides: ocaml-best-compilers
 Description: Native code compilers of the ocaml suite (the .opt ones)

Modified: trunk/packages/ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules	2005-12-13 01:02:52 UTC (rev 2291)
+++ trunk/packages/ocaml/trunk/debian/rules	2005-12-15 17:02:02 UTC (rev 2292)
@@ -74,11 +74,13 @@
 	fi
 	$(MAKE) world
 	$(MAKE) bootstrap
+ifneq ($(DEB_BUILD_ARCH),hppa)
 	if ! grep -q "ARCH=none" config/Makefile; then \
 		echo "Building native compilers" && \
 		$(MAKE) opt opt.opt && \
 		touch opt-built-stamp; \
 	fi
+endif
 	if [ -x ./ocamlopt ]; then					\
 		$(MAKE) -C debian/ocaml-md5sums opt;			\
 	else								\