mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

src/Versions.in: Add guards for opt. alisp symbols

Browse source 
Add guards for optional alisp symbols. This ensures that the Versions
file does not contain undefined symbols when building alisp support is
disabled.

Fixes Gentoo bugs 914511 (https://bugs.gentoo.org/914511),
    914643 (https://bugs.gentoo.org/914643),
    and 919417 (https://bugs.gentoo.org/919417).

Fixes bug #305
Fixes alsa_lisp symbol error reported in bug #356

Closes: https://github.com/alsa-project/alsa-lib/pull/376
Fixes: https://github.com/alsa-project/alsa-lib/issues/305
Link: https://github.com/alsa-project/alsa-lib/issues/356
Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Nicholas Vinson 2024-01-01 16:10:47 -05:00 • committed by Jaroslav Kysela
parent c905573003
commit 10ff172202
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -749,7 +749,7 @@ fi
AC_CONFIG_FILES(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ AC_CONFIG_FILES(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
include/Makefile include/sound/Makefile include/sound/uapi/Makefile \ include/Makefile include/sound/Makefile include/sound/uapi/Makefile \
src/Versions src/Makefile \ src/Versions.in src/Makefile \
src/control/Makefile src/mixer/Makefile \ src/control/Makefile src/mixer/Makefile \
src/pcm/Makefile src/pcm/scopes/Makefile \ src/pcm/Makefile src/pcm/scopes/Makefile \
src/rawmidi/Makefile src/timer/Makefile \ src/rawmidi/Makefile src/timer/Makefile \

11
src/Makefile.am
View file

@ -1,10 +1,11 @@
EXTRA_DIST=Versions
COMPATNUM=@LIBTOOL_VERSION_INFO@ COMPATNUM=@LIBTOOL_VERSION_INFO@
if VERSIONED_SYMBOLS if VERSIONED_SYMBOLS
VSYMS = -Wl,--version-script=Versions VSYMS = -Wl,--version-script=Versions
BUILT_SOURCES = $(top_builddir)/src/Versions
else else
VSYMS = VSYMS =
BUILT_SOURCES =
endif endif
if SYMBOLIC_FUNCTIONS if SYMBOLIC_FUNCTIONS
@ -13,6 +14,8 @@ else
SYMFUNCS = SYMFUNCS =
endif endif
VERSION_CPPFLAGS =
lib_LTLIBRARIES = libasound.la lib_LTLIBRARIES = libasound.la
libasound_la_SOURCES = conf.c confeval.c confmisc.c input.c output.c async.c error.c dlmisc.c socket.c shmarea.c userfile.c names.c libasound_la_SOURCES = conf.c confeval.c confmisc.c input.c output.c async.c error.c dlmisc.c socket.c shmarea.c userfile.c names.c
@ -43,6 +46,9 @@ SUBDIRS += ucm
libasound_la_LIBADD += ucm/libucm.la libasound_la_LIBADD += ucm/libucm.la
endif endif
if BUILD_ALISP if BUILD_ALISP
if VERSIONED_SYMBOLS
VERSION_CPPFLAGS += -DHAVE_ALISP_SYMS
endif
SUBDIRS += alisp SUBDIRS += alisp
libasound_la_LIBADD += alisp/libalisp.la libasound_la_LIBADD += alisp/libalisp.la
endif endif
@ -51,6 +57,9 @@ libasound_la_LIBADD += @ALSA_DEPLIBS@
libasound_la_LDFLAGS = -version-info $(COMPATNUM) $(VSYMS) $(SYMFUNCS) $(LDFLAGS_NOUNDEFINED) libasound_la_LDFLAGS = -version-info $(COMPATNUM) $(VSYMS) $(SYMFUNCS) $(LDFLAGS_NOUNDEFINED)
$(top_builddir)/src/Versions: $(top_builddir)/src/Versions.in
$(COMPILE) -E $(VERSION_CPPFLAGS) -x assembler-with-cpp -o $@ $<
control/libcontrol.la: control/libcontrol.la:
$(MAKE) -C control libcontrol.la $(MAKE) -C control libcontrol.la

4
src/Versions.in → src/Versions.in.in
View file

@ -118,15 +118,19 @@ ALSA_0.9.3 {
} ALSA_0.9.0; } ALSA_0.9.0;
ALSA_0.9.5 { ALSA_0.9.5 {
#ifdef HAVE_ALISP_SYMS
global: global:
@SYMBOL_PREFIX@alsa_lisp; @SYMBOL_PREFIX@alsa_lisp;
#endif
} ALSA_0.9.3; } ALSA_0.9.3;
ALSA_0.9.7 { ALSA_0.9.7 {
#ifdef HAVE_ALISP_SYMS
global: global:
@SYMBOL_PREFIX@alsa_lisp_*; @SYMBOL_PREFIX@alsa_lisp_*;
#endif
} ALSA_0.9.5; } ALSA_0.9.5;
ALSA_1.1.6 { ALSA_1.1.6 {