diff options
| author | drochner <drochner@pkgsrc.org> | 2010-10-30 15:07:42 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-10-30 15:07:42 +0000 |
| commit | 89cadd97e46e98114dc21be202e2700e3a7d85f5 (patch) | |
| tree | 265dafe3d7580cfc78c922a83faca897bf6a2bed /audio/sox | |
| parent | 91220d921aa5768cf8794a9b6b7f6f312edcbdef (diff) | |
| download | pkgsrc-89cadd97e46e98114dc21be202e2700e3a7d85f5.tar.gz | |
-revert last change to the "oss" option handling, it used "configure"
arguments which don't work (but keep inclusion of oss.bl3.mk)
-ignore fmemopen(3) -- the code assumes too much if this is found,
fixes build on NetBSD-current
Diffstat (limited to 'audio/sox')
| -rw-r--r-- | audio/sox/Makefile | 3 | ||||
| -rw-r--r-- | audio/sox/options.mk | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile index 63c021de82b..775b4b6aeb0 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2010/10/27 21:05:37 shattered Exp $ +# $NetBSD: Makefile,v 1.52 2010/10/30 15:07:42 drochner Exp $ DISTNAME= sox-14.3.1 PKGREVISION= 1 @@ -19,6 +19,7 @@ USE_TOOLS+= pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gomp CONFIGURE_ARGS+= --without-libltdl +CONFIGURE_ENV+= ac_cv_func_fmemopen=no PKGCONFIG_OVERRIDE+= sox.pc.in diff --git a/audio/sox/options.mk b/audio/sox/options.mk index 0ad7a2a7fa4..29559482a23 100644 --- a/audio/sox/options.mk +++ b/audio/sox/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/10/27 21:05:37 shattered Exp $ +# $NetBSD: options.mk,v 1.5 2010/10/30 15:07:42 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sox PKG_SUPPORTED_OPTIONS= lame oss @@ -12,8 +12,7 @@ PKG_SUGGESTED_OPTIONS= .endif .if !empty(PKG_OPTIONS:Moss) -CONFIGURE_ARGS+= --enable-oss=yes .include "../../mk/oss.buildlink3.mk" .else -CONFIGURE_ARGS+= --enable-oss=no +CONFIGURE_ARGS+= --without-oss .endif |