tags 651452 + patch
tags 651452 + pending
thanks

Hi!

* Alexander Reichle-Schmehl <alexan...@schmehl.info> [111209 14:41]:
> However I get now the same FTBFS as originally reported.  I guess we
> call that progress...

I think I solved the problem, however I only found a kind of grude
workarround, not a real solution.

The problem seems to be, that petsc is linked to liblam on sparc, and
therefore the additional linkerflad -llam is needed on that arch.  I
have no idea, why this issue han't shown up on armel, mips, mipsel or
s390, the other arches on which petsc uses lam.  My patch adds the
missing flag on sparc.

A nicer fix would be to some detect automatically, if -llam is needed or
not based upon... uh... Don't know what.


That being said, I uploaded the fix to delayed/4.  Please tell me, if I
should delay it longer.


As you can see I also added libmpich2-dev to the build-conflicts.
That's to prevent FTBFS issues as seen while trying to fix the issue in
the porter chroots (see bug log for details).


Best Regards,
  Alexander
diff -Nru illuminator-0.11.0/debian/changelog illuminator-0.11.0/debian/changelog
--- illuminator-0.11.0/debian/changelog	2011-12-04 16:20:54.000000000 +0100
+++ illuminator-0.11.0/debian/changelog	2011-12-12 13:11:42.000000000 +0100
@@ -1,3 +1,15 @@
+illuminator (0.11.0-8.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add -llam to tsclients linker flags to fix FTBFS on sparc (Closes: #651452)
+    * Add Architecture query to debian/rules
+    * Change patches/include-all-libs.patch to include LLAM
+  * Urgency set to medium due to rc bug fix
+  * Add libmpich2-dev to build-conflicts to prevent FTBFS as described in
+    http://bugs.debian.org/651452#22 and #27)
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org>  Mon, 12 Dec 2011 12:10:27 +0000
+
 illuminator (0.11.0-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru illuminator-0.11.0/debian/control illuminator-0.11.0/debian/control
--- illuminator-0.11.0/debian/control	2011-12-04 14:51:46.000000000 +0100
+++ illuminator-0.11.0/debian/control	2011-12-12 13:10:23.000000000 +0100
@@ -6,7 +6,7 @@
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 5.0), quilt, libpetsc3.1-dev, geomview, pkg-config, libglib2.0-dev, libxml2-dev, libimlib2-dev, libreadline-dev, libglade2-dev, libgnomeui-dev, libncurses-dev
 Build-Depends-Indep: cxref, texlive-latex-extra, texlive-latex-recommended, hevea, lmodern
-Build-Conflicts: cpml-ev5, cpml-ev6
+Build-Conflicts: cpml-ev5, cpml-ev6, libmpich2-dev
 Build-Conflicts-Indep: latex2html
 Vcs-Git: git://git.debian.org/git/debian-science/packages/illuminator.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/illuminator.git
diff -Nru illuminator-0.11.0/debian/patches/include-all-libs.patch illuminator-0.11.0/debian/patches/include-all-libs.patch
--- illuminator-0.11.0/debian/patches/include-all-libs.patch	2010-11-30 16:32:21.000000000 +0100
+++ illuminator-0.11.0/debian/patches/include-all-libs.patch	2011-12-12 12:31:15.000000000 +0100
@@ -9,7 +9,7 @@
  # A little timestep visualizer
  tsview_SOURCES = tsview.c
 -tsview_LDADD   = libluminate/libluminate.la -lncurses -lhistory -lreadline
-+tsview_LDADD   = libluminate/libluminate.la -lpetsc -lncurses -lhistory -lreadline
++tsview_LDADD   = libluminate/libluminate.la $(LLAM) -lpetsc -lncurses -lhistory -lreadline
  tsview_CFLAGS  = $(PETSC_INCLUDE) $(GTK_CFLAGS) $(GEOMVIEW_CFLAGS) # -DDEBUG
  
  # Next-generation timestep visualizer
@@ -37,7 +37,7 @@
  # A little timestep visualizer
  tsview_SOURCES = tsview.c
 -tsview_LDADD = libluminate/libluminate.la -lncurses -lhistory -lreadline
-+tsview_LDADD = libluminate/libluminate.la -lpetsc -lncurses -lhistory -lreadline
++tsview_LDADD = libluminate/libluminate.la $(LLAM) -lpetsc -lncurses -lhistory -lreadline
  tsview_CFLAGS = $(PETSC_INCLUDE) $(GTK_CFLAGS) $(GEOMVIEW_CFLAGS) # -DDEBUG
  
  # Next-generation timestep visualizer
diff -Nru illuminator-0.11.0/debian/rules illuminator-0.11.0/debian/rules
--- illuminator-0.11.0/debian/rules	2010-11-30 16:26:54.000000000 +0100
+++ illuminator-0.11.0/debian/rules	2011-12-12 12:57:10.000000000 +0100
@@ -4,6 +4,15 @@
 
 package=illuminator
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH), sparc)
+	LLAM=-llam
+else
+	LLAM=
+endif
+
+
 patch:
 	dh_testdir
 	if [ ! -e illuminator.m4.backup ]; then \
@@ -23,7 +32,7 @@
 
 build: stamp-configure
 	dh_testdir
-	$(MAKE)
+	LLAM=$(LLAM) $(MAKE)
 	touch $@
 
 clean:

Reply via email to