File: cross.patch

package info (click to toggle)
ampliconnoise 1.29-17
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 6,348 kB
  • sloc: ansic: 18,085; sh: 2,901; perl: 2,089; makefile: 245
file content (96 lines) | stat: -rw-r--r-- 2,680 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Description: Fix cross building with openmpi.
 ampliconnoise fails to cross build from source as it misses mpi compiler
 flags. In theory, it uses mpicc, but cross builds override CC with a
 non-mpi cross compiler and that's where flags go missing. Fundamentally,
 mpicc and cross building are incompatible. For openmpi, the solution is
 to use pkgconf, but mpich does not provide mpi-c anymore. I'm proposing
 a compromise here: Attempt to use pkgconf to add the flags, but do not
 fail when pkgconf doesn't work (e.g. on 32bit archs that use mpich).
 Then native building will continue to work everywhere (as it continues
 to use mpicc) while cross building will work for 64bit targets (where
 openmpi is used). Cross builds to 32bit architectures remain broken for
 now.
Author: Helmut Grohne <helmut@subdivi.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1107485
Forwarded: no
Reviewed-by: Étienne Mollier <emollier@debian.org>
Last-Update: 2025-06-07
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- ampliconnoise.orig/NDist/makefile
+++ ampliconnoise/NDist/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = $(LDFLAGS)
 EFILE  = NDist
-LIBS   = -lm  
+LIBS   = -lm $(MPI_LIBS)
 OBJS   = NDist.o 
 
 $(EFILE) : $(OBJS)
--- ampliconnoise.orig/PyroDist/makefile
+++ ampliconnoise/PyroDist/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = $(LDFLAGS)
 EFILE  = PyroDist
-LIBS   = -lm 
+LIBS   = -lm $(MPI_LIBS)
 OBJS   = PyroDist.o
 
 $(EFILE) : $(OBJS)
--- ampliconnoise.orig/PyroNoise/makefile
+++ ampliconnoise/PyroNoise/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = $(LDFLAGS)
 EFILE  = PyroNoise
-LIBS   =  -lm
+LIBS   =  -lm $(MPI_LIBS)
 OBJS   = PyroNoise.o 
 
 $(EFILE) : $(OBJS)
--- ampliconnoise.orig/PyroNoiseA/makefile
+++ ampliconnoise/PyroNoiseA/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = 
 EFILE  = PyroNoiseA
-LIBS   =  -lm
+LIBS   =  -lm $(MPI_LIBS)
 OBJS   = PyroNoiseA.o 
 
 $(EFILE) : $(OBJS)
--- ampliconnoise.orig/PyroNoiseM/makefile
+++ ampliconnoise/PyroNoiseM/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = $(LDFLAGS)
 EFILE  = PyroNoiseM
-LIBS   =  -lm
+LIBS   =  -lm $(MPI_LIBS)
 OBJS   = PyroNoiseM.o 
 
 $(EFILE) : $(OBJS)
--- ampliconnoise.orig/SeqDist/makefile
+++ ampliconnoise/SeqDist/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = $(LDFLAGS)
 EFILE  = SeqDist
-LIBS   = -lm 
+LIBS   = -lm $(MPI_LIBS)
 OBJS   = SeqDist.o
 
 $(EFILE) : $(OBJS)
--- ampliconnoise.orig/SeqNoise/makefile
+++ ampliconnoise/SeqNoise/makefile
@@ -2,7 +2,7 @@
 CFLAGS += -O3
 EFLAGS = $(LDFLAGS)
 EFILE  = SeqNoise
-LIBS   = -lm 
+LIBS   = -lm $(MPI_LIBS)
 OBJS   = SeqNoise.o
 
 $(EFILE) : $(OBJS)