diff options
| author | fox <fox@pkgsrc.org> | 2019-08-07 23:49:02 +0000 |
|---|---|---|
| committer | fox <fox@pkgsrc.org> | 2019-08-07 23:49:02 +0000 |
| commit | 71216f70d58cb987bfd34a53ba20340b146ae1b7 (patch) | |
| tree | 80b3a5698d541eccfa9ed57a3441474d668968c3 | |
| parent | 6ddd04ea60ea0493816e0bf70d4d7ee4f2d69270 (diff) | |
| download | pkgsrc-71216f70d58cb987bfd34a53ba20340b146ae1b7.tar.gz | |
din: Fixes builds in Linux.
1. Should fix builds in Ubuntu, LIBS are appended correctly during link.
2. Bumps PKGREVISION.
| -rw-r--r-- | audio/din/Makefile | 8 | ||||
| -rw-r--r-- | audio/din/options.mk | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/audio/din/Makefile b/audio/din/Makefile index 64d955f1c64..b17e21b91f9 100644 --- a/audio/din/Makefile +++ b/audio/din/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2019/07/28 17:12:46 fox Exp $ +# $NetBSD: Makefile,v 1.8 2019/08/07 23:49:02 fox Exp $ DISTNAME= din-42 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= https://archive.org/download/dinisnoise_source_code/ @@ -14,8 +14,8 @@ USE_LANGUAGES= c c++ USE_TOOLS+= autoreconf pkg-config gmake GNU_CONFIGURE= yes -LDFLAGS+= -ltcl -lSDL -lGL -lpthread -LDFLAGS.Darwin+= -lSDLmain +LIBS+= -ltcl -lSDL -lGL -lpthread +LIBS.Darwin+= -lSDLmain .include "options.mk" diff --git a/audio/din/options.mk b/audio/din/options.mk index 337e71d9e9c..0c6be13fd7a 100644 --- a/audio/din/options.mk +++ b/audio/din/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/12/10 20:33:06 fox Exp $ +# $NetBSD: options.mk,v 1.2 2019/08/07 23:49:02 fox Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.din PKG_OPTIONS_OPTIONAL_GROUPS= backend @@ -11,8 +11,8 @@ PKG_SUGGESTED_OPTIONS= jack ### Support ALSA ### .if !empty(PKG_OPTIONS:Malsa) -CXXFLAGS+= -D__LINUX_ALSA__ -LDFLAGS+= -lasound +CXXFLAGS+= -D__LINUX_ALSA__ +LIBS+= -lasound .include "../../audio/alsa-lib/buildlink3.mk" .endif @@ -20,7 +20,7 @@ LDFLAGS+= -lasound ### Support JACK ### .if !empty(PKG_OPTIONS:Mjack) -CXXFLAGS+= -D__UNIX_JACK__ -LDFLAGS+= -ljack +CXXFLAGS+= -D__UNIX_JACK__ +LIBS+= -ljack .include "../../audio/jack/buildlink3.mk" .endif |