debian/changelog

+ffindex (0.9.9.9-3) unstable; urgency=medium
+
+  * Team upload
+  * Tweak cross patch to unbreak build, where
+    wl,asneeded is default (Closes: #925678).
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 10 May 2019 08:54:14 +0200
+
 ffindex (0.9.9.9-2) unstable; urgency=medium
 
   * Team upload.

debian/patches/cross.patch

@@ -6,8 +6,10 @@ is unfixable in terms of cross building, which is why it is being moved
 to pkg-config upstream. Rather than wrap your build in mpicc, you can
 compute the relevant flags using pkg-config just like any other library.
 
---- ffindex-0.9.9.9.orig/src/Makefile
-+++ ffindex-0.9.9.9/src/Makefile
+Index: ffindex/src/Makefile
+===================================================================
+--- ffindex.orig/src/Makefile
++++ ffindex/src/Makefile
 @@ -7,7 +7,10 @@
  #CC=gcc
  #CC=icc
@@ -15,7 +17,7 @@ compute the relevant flags using pkg-config just like any other library.
 +PKG_CONFIG?=pkg-config
  CFLAGS+=-std=c99 -O2 -g -fPIC -Wall -pedantic -D_GNU_SOURCE=1 -I. $(CPPFLAGS)
 +CFLAGS_MPI=$(shell $(PKG_CONFIG) --cflags mpi)
-+LDFLAGS_MPI=$(shell $(PKG_CONFIG) --libs mpi)
++LIBS_MPI=$(shell $(PKG_CONFIG) --libs mpi)
  SOCURRENT=2
  SOREVISION=0
  SOAGE=2
@@ -24,7 +26,7 @@ compute the relevant flags using pkg-config just like any other library.
  
  ffindex_apply_mpi: ffindex_apply_mpi.o $(FFINDEX_LIBS)
 -	mpicc $(CFLAGS) -DHAVE_MPI -o $@  ffindex_apply_mpi.o $(LDFLAGS) -L. -lffindex
-+	$(CC) $(CFLAGS_MPI) $(LDFLAGS_MPI) $(CFLAGS) -DHAVE_MPI -o $@  ffindex_apply_mpi.o $(LDFLAGS) -L. -lffindex
++	$(CC) $(CFLAGS_MPI) $(CFLAGS) -DHAVE_MPI -o $@  ffindex_apply_mpi.o $(LDFLAGS) -L. -lffindex $(LIBS_MPI)
  
  ffindex_apply_mpi.o: ffindex_apply_mpi.c $(FFINDEX_HEADERS)
 -	mpicc $(CFLAGS) -DHAVE_MPI -c ffindex_apply_mpi.c -o $@ 
@@ -32,7 +34,7 @@ compute the relevant flags using pkg-config just like any other library.
  
  ffindex_apply_mpi_spawn: ffindex_apply_mpi_spawn.o $(FFINDEX_LIBS)
 -	mpicc $(CFLAGS) -o $@  ffindex_apply_mpi_spawn.o $(LDFLAGS)
-+	$(CC) $(CFLAGS_MPI) $(LDFLAGS_MPI) $(CFLAGS) -o $@  ffindex_apply_mpi_spawn.o $(LDFLAGS)
++	$(CC) $(CFLAGS_MPI) $(CFLAGS) -o $@  ffindex_apply_mpi_spawn.o $(LDFLAGS) $(LIBS_MPI)
  
  ffindex_apply_mpi_spawn.o: ffindex_apply_mpi_spawn.o $(FFINDEX_HEADERS)
 -	mpicc $(CFLAGS) -c ffindex_apply_mpi_spawn.c -o $@