Sat Apr 15 11:59:34 2023 UTC ()
Unbreak building fluidsynth if gmake 4.4.1 is installed.

While fluidsynth compiles with BSD make, it will use gmake if available.
This happened to work in the past even if gmake was not in USE_TOOLS,
but the latest gmake update (4.4.1) added an incompatible change.
Adding gmake to USE_TOOLS fixes this.


(hgutch)
diff -r1.70 -r1.71 pkgsrc/audio/fluidsynth/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/audio/fluidsynth/Makefile (switch to unified diff)

--- pkgsrc/audio/fluidsynth/Makefile 2023/01/24 18:36:18 1.70
+++ pkgsrc/audio/fluidsynth/Makefile 2023/04/15 11:59:34 1.71
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1# $NetBSD: Makefile,v 1.70 2023/01/24 18:36:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2023/04/15 11:59:34 hgutch Exp $
2 2
3DISTNAME= fluidsynth-2.3.1 3DISTNAME= fluidsynth-2.3.1
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_GITHUB:=FluidSynth/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=FluidSynth/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.fluidsynth.org/ 9HOMEPAGE= https://www.fluidsynth.org/
10COMMENT= Software synthesizer based on SoundFont2 10COMMENT= Software synthesizer based on SoundFont2
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config gmake
15 15
16CHECK_PORTABILITY_SKIP+= test-android/convert-tests.sh 16CHECK_PORTABILITY_SKIP+= test-android/convert-tests.sh
17 17
18CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}/man1 18CMAKE_ARGS+= -DMAN_INSTALL_DIR=${PREFIX}/${PKGMANDIR}/man1
19CMAKE_ARGS+= -DLIB_SUFFIX="" 19CMAKE_ARGS+= -DLIB_SUFFIX=""
20CMAKE_ARGS+= -Denable-framework=OFF 20CMAKE_ARGS+= -Denable-framework=OFF
21 21
22PKGCONFIG_OVERRIDE= fluidsynth.pc.in 22PKGCONFIG_OVERRIDE= fluidsynth.pc.in
23 23
24LDFLAGS.SunOS+= -lsocket 24LDFLAGS.SunOS+= -lsocket
25 25
26BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--as-needed 26BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--as-needed
27 27
28.include "../../mk/oss.buildlink3.mk" 28.include "../../mk/oss.buildlink3.mk"
29 29
30.if ${OSS_TYPE} != "none" 30.if ${OSS_TYPE} != "none"
31LDFLAGS+= ${LIBOSSAUDIO} 31LDFLAGS+= ${LIBOSSAUDIO}
32SUBST_CLASSES+= oss 32SUBST_CLASSES+= oss
33SUBST_STAGE.oss= pre-configure 33SUBST_STAGE.oss= pre-configure
34SUBST_MESSAGE.oss= Correcting the path to the OSS device. 34SUBST_MESSAGE.oss= Correcting the path to the OSS device.
35SUBST_FILES.oss+= src/drivers/fluid_oss.c 35SUBST_FILES.oss+= src/drivers/fluid_oss.c
36SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 36SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
37SUBST_SED.oss+= -e "s,/dev/midi,${DEVOSSMIDI},g" 37SUBST_SED.oss+= -e "s,/dev/midi,${DEVOSSMIDI},g"
38.endif 38.endif
39 39
40# mlock on SunOS has a caddr_t argument rather than void * 40# mlock on SunOS has a caddr_t argument rather than void *
41BUILDLINK_TRANSFORM+= rm:-Werror=incompatible-pointer-types 41BUILDLINK_TRANSFORM+= rm:-Werror=incompatible-pointer-types
42 42
43.include "options.mk" 43.include "options.mk"
44.include "../../devel/cmake/build.mk" 44.include "../../devel/cmake/build.mk"
45.include "../../audio/libsndfile/buildlink3.mk" 45.include "../../audio/libsndfile/buildlink3.mk"
46.include "../../devel/libgetopt/buildlink3.mk" 46.include "../../devel/libgetopt/buildlink3.mk"
47.include "../../devel/glib2/buildlink3.mk" 47.include "../../devel/glib2/buildlink3.mk"
48.include "../../mk/readline.buildlink3.mk" 48.include "../../mk/readline.buildlink3.mk"
49.include "../../mk/pthread.buildlink3.mk" 49.include "../../mk/pthread.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"