Package: praat / 6.1.38-1

cross-build.patch Patch series | 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
97
98
99
100
101
102
103
104
105
106
107
108
109
Description: Fix cross-build issues
Author: Helmut Grohne <helmut@subdivi.de>
Bug-Debian: https://bugs.debian.org/919490
Forwarded: not-needed
Reviewed-By: Rafael Laboissière <rafael@debian.org>
Last-Update: 2020-11-11

--- praat-6.1.14.orig/makefiles/makefile.defs.chrome64
+++ praat-6.1.14/makefiles/makefile.defs.chrome64
@@ -7,17 +7,19 @@ CC = gcc
 
 CXX = g++
 
-COMMONFLAGS = -DUNIX -Dlinux -Dchrome -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-3.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
+PKG_CONFIG ?= pkg-config
+
+COMMONFLAGS = -DUNIX -Dlinux -Dchrome -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `$(PKG_CONFIG) --cflags gtk+-3.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
 
 CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werror=missing-prototypes -Werror=implicit
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat
 
-LIBS = `pkg-config --libs gtk+-3.0` -lm -lpulse -lasound -static-libgcc -static-libstdc++ -lpthread -L /usr/lib/x86_64-linux-gnu -lX11
+LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` -lm -lpulse -lasound -static-libgcc -static-libstdc++ -lpthread -L /usr/lib/x86_64-linux-gnu -lX11
 
 AR = ar
 RANLIB = ls
--- praat-6.1.14.orig/makefiles/makefile.defs.cygwin64
+++ praat-6.1.14/makefiles/makefile.defs.cygwin64
@@ -14,7 +14,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS)
 
 CXXFLAGS = -std=gnu++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = Praat.exe
 
--- praat-6.1.14.orig/makefiles/makefile.defs.linux.alsa
+++ praat-6.1.14/makefiles/makefile.defs.linux.alsa
@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat
 
--- praat-6.1.14.orig/makefiles/makefile.defs.linux.barren
+++ praat-6.1.14/makefiles/makefile.defs.linux.barren
@@ -13,7 +13,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat_barren
 
--- praat-6.1.14.orig/makefiles/makefile.defs.linux.jack
+++ praat-6.1.14/makefiles/makefile.defs.linux.jack
@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat
 
--- praat-6.1.14.orig/makefiles/makefile.defs.linux.nogui
+++ praat-6.1.14/makefiles/makefile.defs.linux.nogui
@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat_nogui
 
--- praat-6.1.14.orig/makefiles/makefile.defs.linux.rpi
+++ praat-6.1.14/makefiles/makefile.defs.linux.rpi
@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat
 
--- praat-6.1.14.orig/makefiles/makefile.defs.linux.silent
+++ praat-6.1.14/makefiles/makefile.defs.linux.silent
@@ -15,7 +15,7 @@ CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werr
 
 CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow
 
-LINK = g++
+LINK = $(CXX)
 
 EXECUTABLE = praat