diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-13 22:59:19 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 42c07c42f885cd6a06fa61584d0c05fc34e4d45a (patch) | |
| tree | f3ea84de30605b432a6aa8be097f2ecdf0f487ea | |
| parent | 8bf7f4ff20433ae0c7175121bcd4889ce9e9789c (diff) | |
alsa-lib: Remove snd_pcm_hwsync warning
alsa-lib calls this internally, producing a warning when linking any
binary with libasound.a. On a normal system, libasound.a is linked in
with -lasound, which seems to silence the warning. However, it is much
easier for us to just pass the whole path so instead remove the
offending warning section with objcopy.
| -rw-r--r-- | pkg/alsa-lib/gen.rc | 6 | ||||
| -rw-r--r-- | rules.ninja | 3 | ||||
| -rw-r--r-- | toolchain/default.ninja | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/pkg/alsa-lib/gen.rc b/pkg/alsa-lib/gen.rc index 88157433..c4d8f33e 100644 --- a/pkg/alsa-lib/gen.rc +++ b/pkg/alsa-lib/gen.rc @@ -22,6 +22,10 @@ for(hdr in asoundlib.h version.h) build '$outdir'/include/alsa/$hdr copy '$dir'/alsa/$hdr phony headers '$outdir'/include/alsa/^($hdrs asoundlib.h version.h) +cc src/pcm/pcm.c +build '$outdir'/src/pcm/pcm.nowarn.c.o objcopy '$outdir'/src/pcm/pcm.c.o ; with\ + objcopyflags '-R .gnu.warning.snd_pcm_hwsync' + lib libasound.a src/^(\ conf.c confmisc.c input.c output.c async.c error.c dlmisc.c socket.c shmarea.c userfile.c names.c\ control/^(\ @@ -34,7 +38,7 @@ lib libasound.a src/^(\ mixer/^(bag.c mixer.c simple.c simple_none.c)\ pcm/^(\ mask.c interval.c\ - pcm.c pcm_params.c pcm_simple.c\ + pcm.nowarn.c.o pcm_params.c pcm_simple.c\ pcm_hw.c pcm_misc.c pcm_mmap.c pcm_symbols.c\ pcm_generic.c pcm_plugin.c\ pcm_copy.c\ diff --git a/rules.ninja b/rules.ninja index ae79edb1..972a641e 100644 --- a/rules.ninja +++ b/rules.ninja @@ -17,6 +17,9 @@ rule link rule ar command = rm -f $out && $ar crs $out $in +rule objcopy + command = $objcopy $objcopyflags $in $out + rule lines command = ln -f $rspfile $out rspfile = $out.tmp diff --git a/toolchain/default.ninja b/toolchain/default.ninja index 7118c79c..aa034557 100644 --- a/toolchain/default.ninja +++ b/toolchain/default.ninja @@ -2,3 +2,4 @@ ar = ar as = as cc = cc cxx = c++ +objcopy = objcopy |