[Plplot-cvs] SF.net SVN: plplot: [8340] trunk/debian

[<rla...@us...>]

Revision: 8340
          http://plplot.svn.sourceforge.net/plplot/?rev=8340&view=rev
Author:   rlaboiss
Date:     2008-03-28 06:17:08 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
Do not build the Ada binding on mips and mipsel

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/control.in
    trunk/debian/rules

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-28 12:10:05 UTC (rev 8339)
+++ trunk/debian/changelog	2008-03-28 13:17:08 UTC (rev 8340)
@@ -1,3 +1,15 @@
+plplot (5.9.0-5) UNRELEASED; urgency=low
+
+  [ Andrew Ross ]
+  * debian/control.in: Make it clear that the ada bindings are still
+    experimental
+
+  [ Rafael Laboissiere ]
+  * debian/control.in, debian/rules: Do not build the Ada binding on mips
+    and mipsel
+
+ -- Rafael Laboissiere <ra...@de...>  Fri, 28 Mar 2008 11:32:20 +0100
+
 plplot (5.9.0-4) unstable; urgency=low
 
   * debian/control.in:

Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in	2008-03-28 12:10:05 UTC (rev 8339)
+++ trunk/debian/control.in	2008-03-28 13:17:08 UTC (rev 8340)
@@ -14,8 +14,7 @@
  python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
  python-numpy (>= 1.0.4-4), ttf-freefont, java-gcj-compat-dev [!arm],
- fastjar, swig, gnat [!alpha !arm !mips !mipsel],
- gnat-4.1 [alpha mips mipsel]
+ fastjar, swig, gnat [!alpha !arm !mips !mipsel], gnat-4.1 [alpha]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-03-28 12:10:05 UTC (rev 8339)
+++ trunk/debian/rules	2008-03-28 13:17:08 UTC (rev 8340)
@@ -32,17 +32,38 @@
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+BUILD_ADA = yes
+BUILD_JAVA = yes
+
 # Disable java and ada build on arm - problems with java-gcj-compat-dev
-# at the moment. Also gnat not available on arm.
+# at the moment. Also gnat not available on arm, mips, and mipsel.
+
 ifeq ($(DEB_BUILD_ARCH),arm)
+BUILD_ADA = no
+BUILD_JAVA = no
+endif
+
+ifeq ($(DEB_BUILD_ARCH),mips)
+BUILD_ADA = no
+endif
+
+ifeq ($(DEB_BUILD_ARCH),mipsel)
+BUILD_ADA = no
+endif
+
+ifeq ($(BUILD_ADA),yes)
+ADA_OPTIONS = -DENABLE_ada=ON
+else
 ADA_OPTIONS = -DENABLE_ada=OFF
-JAVA_OPTIONS = -DENABLE_java=OFF
-else
-ADA_OPTIONS = -DENABLE_ada=ON
+endif
+
+ifeq ($(BUILD_JAVA),yes)
 JAVA_OPTIONS = \
 	-DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \
 	-DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \
 	-DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar
+else
+JAVA_OPTIONS = -DENABLE_java=OFF
 endif
 
 CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
@@ -54,12 +75,21 @@
 BUILD_DIR = $(debbase)/build_tmp
 SRC_DIR = $(shell pwd)
 
+
 control:
-ifneq ($(DEB_BUILD_ARCH),arm)
-	slice -o UNDEF+JAVA+ADA:debian/control debian/control.in
+ifeq ($(BUILD_ADA),no)
+ifeq ($(BUILD_JAVA),no)
+	slice -o UNDEF:debian/control debian/control.in
 else
-	slice -o UNDEF:debian/control debian/control.in
+	slice -o UNDEF+JAVA:debian/control debian/control.in
 endif
+else
+ifeq ($(BUILD_JAVA),no)
+	slice -o UNDEF+ADA:debian/control debian/control.in
+else
+	slice -o UNDEF+JAVA+ADA:debian/control debian/control.in
+endif
+endif
 
 config: config-stamp
 config-stamp: control
@@ -105,9 +135,11 @@
 		     --no-package=libplplot9-java --no-package=libplplot-ada
 	dh_movefiles --package=python-plplot
 	dh_movefiles --package=plplot-bin
-ifneq ($(DEB_BUILD_ARCH),arm)
+ifeq ($(BUILD_JAVA),yes)
+	dh_movefiles --package=libplplot9-java
+endif
+ifeq ($(BUILD_ADA),yes)
 	dh_movefiles --package=libplplot-ada
-	dh_movefiles --package=libplplot9-java
 	dh_movefiles --package=libplplot-dev usr/share/ada
 else
 	dh_movefiles --package=libplplot-dev
@@ -140,14 +172,16 @@
 	  ln -s $(libpkg) $(debdoc)/$$i ;				\
 	done
 
-ifneq ($(DEB_BUILD_ARCH),arm)
-	for i in libplplot9-java libplplot-ada ; do			\
-		ln -s $(libpkg) $(debdoc)/$$i ;				\
-	done
+ifeq ($(BUILD_JAVA),yes)
+	ln -s $(libpkg) $(debdoc)/libplplot9-java
 	mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar
 	( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar )
 endif
 
+ifeq ($(BUILD_ADA),yes)
+	ln -s $(libpkg) $(debdoc)/libplplot-ada
+endif
+
 	touch install-arch-stamp
 
 install-indep: install-indep-stamp


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.