]> git.alsa-project.org Git - alsa-lib.git/commitdiff
rawmidi: symbols: use rawmidi_virt only when available
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 11 Aug 2017 21:24:03 +0000 (23:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 12 Aug 2017 21:40:19 +0000 (23:40 +0200)
src/rawmidi/Makefile.am only brings rawmidi_virt.c into the build when
BUILD_SEQ is defined (i.e when --enable-seq is passed). However,
rawmidi_symbols.c unconditionally refers to _snd_module_rawmidi_virt,
defined in rawmidi_virt.c.

This causes a link failure when BUILD_SEQ is disabled. For example
when linking ffmpeg against alsa-lib:

/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libasound.a(pcm_dmix.o): In function `snd_pcm_dmix_sync_ptr':
pcm_dmix.c:(.text+0x83c): warning:
/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libasound.a(rawmidi_symbols.o):(.data+0x4): undefined reference to `_snd_module_rawmidi_virt'
collect2: error: ld returned 1 exit status

To fix this, we make sure that rawmidi_symbols.c only uses
_snd_module_rawmidi_virt when available.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/rawmidi/rawmidi_symbols.c

index cdc06d7fbe0756e4e7d4bf409d16a933a118aa57..64734334aa3cc1b5d5ce6df5c0566f263f9ca2b5 100644 (file)
 #ifndef PIC
 
 extern const char *_snd_module_rawmidi_hw;
+#ifdef BUILD_SEQ
 extern const char *_snd_module_rawmidi_virt;
+#endif
 
 static const char **snd_rawmidi_open_objects[] = {
        &_snd_module_rawmidi_hw,
+#ifdef BUILD_SEQ
        &_snd_module_rawmidi_virt
+#endif
 };
        
 void *snd_rawmidi_open_symbols(void)