Control: tags -1 - moreinfo On Mon, Mar 30, 2020 at 03:12:21PM +0200, Rafael Laboissière wrote: > Could you, please, be more precise about this? As far as I can tell, the > patch has indeed be applied upstream. Could you please tell me if there is > something in cross-build.patch that has been overlooked?
I'm attaching a patch with the remaining bits against praat/6.1.14-1 your convenience. Helmut
--- praat-6.1.14.orig/makefiles/makefile.defs.chrome64 +++ praat-6.1.14/makefiles/makefile.defs.chrome64 @@ -7,17 +7,19 @@ CXX = g++ -COMMONFLAGS = -DUNIX -Dlinux -Dchrome -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.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+-2.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+-2.0` -lm -lpulse -lasound -lpthread +LIBS = `$(PKG_CONFIG) --libs gtk+-2.0` -lm -lpulse -lasound -lpthread 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow -LINK = g++ +LINK = $(CXX) EXECUTABLE = praat
