[med-svn] [Git][med-team/ffindex][master] 3 commits: tweak cross patch, to fix build with wlasneeded gcc flag (default in gcc-9)

[Gianfranco Costamagna]

Gianfranco Costamagna pushed to branch master at Debian Med / ffindex


Commits:
3601fc98 by Gianfranco Costamagna at 2019-05-10T06:58:36Z
tweak cross patch, to fix build with wlasneeded gcc flag (default in gcc-9)

- - - - -
b899a32e by Gianfranco Costamagna at 2019-05-10T06:59:09Z
Refresh previous patch to stop adding newlines

- - - - -
ba604533 by Gianfranco Costamagna at 2019-05-10T06:59:53Z
Update changelog, upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/cross.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+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 at 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,37 +6,39 @@ 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
-@@ -7,7 +7,10 @@
- #CC=gcc
- #CC=icc
- #CC=clang
-+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)
- SOCURRENT=2
- SOREVISION=0
- SOAGE=2
-@@ -61,16 +64,16 @@
- 	$(CC) $(CFLAGS) -o $@  ffindex_apply.o $(LDFLAGS) -L. -lffindex
- 
- 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
- 
- ffindex_apply_mpi.o: ffindex_apply_mpi.c $(FFINDEX_HEADERS)
--	mpicc $(CFLAGS) -DHAVE_MPI -c ffindex_apply_mpi.c -o $@ 
-+	$(CC) $(CFLAGS_MPI) $(CFLAGS) -DHAVE_MPI -c ffindex_apply_mpi.c -o $@ 
- 
- 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)
- 
- ffindex_apply_mpi_spawn.o: ffindex_apply_mpi_spawn.o $(FFINDEX_HEADERS)
--	mpicc $(CFLAGS) -c ffindex_apply_mpi_spawn.c -o $@ 
-+	$(CC) $(CFLAGS_MPI) $(CFLAGS) -c ffindex_apply_mpi_spawn.c -o $@ 
- 
- ffindex_from_fasta: ffindex_from_fasta.o $(FFINDEX_LIBS)
- 	$(CC) -o $@ ffindex_from_fasta.o $(LDFLAGS) $(STATIC)
+Index: ffindex/src/Makefile
+===================================================================
+--- ffindex.orig/src/Makefile
++++ ffindex/src/Makefile
+@@ -7,7 +7,10 @@
+ #CC=gcc
+ #CC=icc
+ #CC=clang
++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)
++LIBS_MPI=$(shell $(PKG_CONFIG) --libs mpi)
+ SOCURRENT=2
+ SOREVISION=0
+ SOAGE=2
+@@ -61,16 +64,16 @@
+ 	$(CC) $(CFLAGS) -o $@  ffindex_apply.o $(LDFLAGS) -L. -lffindex
+ 
+ ffindex_apply_mpi: ffindex_apply_mpi.o $(FFINDEX_LIBS)
+-	mpicc $(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 $@ 
++	$(CC) $(CFLAGS_MPI) $(CFLAGS) -DHAVE_MPI -c ffindex_apply_mpi.c -o $@ 
+ 
+ ffindex_apply_mpi_spawn: ffindex_apply_mpi_spawn.o $(FFINDEX_LIBS)
+-	mpicc $(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 $@ 
++	$(CC) $(CFLAGS_MPI) $(CFLAGS) -c ffindex_apply_mpi_spawn.c -o $@ 
+ 
+ ffindex_from_fasta: ffindex_from_fasta.o $(FFINDEX_LIBS)
+ 	$(CC) -o $@ ffindex_from_fasta.o $(LDFLAGS) $(STATIC)



View it on GitLab: https://salsa.debian.org/med-team/ffindex/compare/e961e434aebd1c8800d6f8a77b2a05b5fcad6fae...ba6045333d9c4f9e09c461e80835574748c31a87

-- 
View it on GitLab: https://salsa.debian.org/med-team/ffindex/compare/e961e434aebd1c8800d6f8a77b2a05b5fcad6fae...ba6045333d9c4f9e09c461e80835574748c31a87
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190510/9d1ff321/attachment-0001.html>