diff options
| author | dbj <dbj@pkgsrc.org> | 2019-12-24 05:07:45 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2019-12-24 05:07:45 +0000 |
| commit | 136e6db0215efe118ae16f309a5258cc79eccb7a (patch) | |
| tree | 8c5930321888fab34de23baddb55332d2c7e1ce0 /audio | |
| parent | 38227a070e6afbe0afc945e4ade90c6b51e12cac (diff) | |
| download | pkgsrc-136e6db0215efe118ae16f309a5258cc79eccb7a.tar.gz | |
audio/libao: fix Darwin build
libao tried disable the macos plugin by setting a configure
environment variable that didn't work. This forces the option
off by the SUBST framework to edit the config file.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/libao-macosx/Makefile | 3 | ||||
| -rw-r--r-- | audio/libao/Makefile | 8 | ||||
| -rw-r--r-- | audio/libao/Makefile.common | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/audio/libao-macosx/Makefile b/audio/libao-macosx/Makefile index 5e4c791fd0c..ae5d638e96a 100644 --- a/audio/libao-macosx/Makefile +++ b/audio/libao-macosx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/11/24 00:35:57 nia Exp $ +# $NetBSD: Makefile,v 1.9 2019/12/24 05:07:45 dbj Exp $ .include "../../audio/libao/Makefile.common" @@ -8,7 +8,6 @@ COMMENT+= (MacOS X plugin) ONLY_FOR_PLATFORM+= Darwin-*-* -CONFIGURE_ENV:= ${CONFIGURE_ENV:S/have_macosx=no//1} BUILD_DIRS= src/plugins/macosx INSTALL_DIRS= src/plugins/macosx diff --git a/audio/libao/Makefile b/audio/libao/Makefile index e48efbb47cb..57af93ac79a 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -1,7 +1,13 @@ -# $NetBSD: Makefile,v 1.35 2019/11/24 00:35:56 nia Exp $ +# $NetBSD: Makefile,v 1.36 2019/12/24 05:07:45 dbj Exp $ .include "Makefile.common" INSTALLATION_DIRS+= lib/ao/plugins-4 +SUBST_CLASSES+= disable-macosx +SUBST_MESSAGE.disable-macosx+= Force disabling macosx plugin. +SUBST_STAGE.disable-macosx= pre-configure +SUBST_FILES.disable-macosx= configure.ac +SUBST_SED.disable-macosx= -e 's,have_macosx=yes,have_macosx=disabled,' + .include "../../mk/bsd.pkg.mk" diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common index 32eaf83dbc3..3654aa931d8 100644 --- a/audio/libao/Makefile.common +++ b/audio/libao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2019/11/24 00:35:56 nia Exp $ +# $NetBSD: Makefile.common,v 1.41 2019/12/24 05:07:45 dbj Exp $ # # used by audio/libao-alsa/Makefile # used by audio/libao-arts/Makefile @@ -43,7 +43,6 @@ CONFIGURE_ENV+= ac_cv_header_sys_soundcard_h=no # disable OSS by default CONFIGURE_ENV+= ac_cv_header_machine_soundcard_h=no CONFIGURE_ENV+= ac_cv_header_sys_audioio_h=no # disable Sun audio by default CONFIGURE_ENV+= ac_cv_header_sndio_h=no # disable sndio by default -CONFIGURE_ENV+= have_macosx=no # disable macOS audio by default MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} |