[pulseaudio-discuss] [PATCH] build-sys: Don't build glib-dependent things with --disable-glib2

[Arun Raghavan]

On 19 April 2016 at 01:31, Tanu Kaskinen <tanuk at iki.fi> wrote:
> On Mon, 2016-04-18 at 10:36 +0530, arun at accosted.net wrote:
>> From: Arun Raghavan <git at arunraghavan.net>
>>
>> Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=94965
>> Signed-off-by: Arun Raghavan <git at arunraghavan.net>
>> ---
>>
>>  src/Makefile.am | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index 07cd537..c1a025f 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -485,10 +485,12 @@ cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2 $(LIBCHECK_CFLAGS)
>>  cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
>>  cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
>>
>> +if HAVE_GLIB20
>>  mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
>>  mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(LIBCHECK_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP
>>  mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpulse-mainloop-glib.la
>>  mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
>> +endif
>>
>>  memblockq_test_SOURCES = tests/memblockq-test.c
>>  memblockq_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
>> @@ -585,10 +587,12 @@ sigbus_test_LDADD = $(AM_LDADD) libpulsecore- at PA_MAJORMINOR@.la libpulse.la libp
>>  sigbus_test_CFLAGS = $(AM_CFLAGS) $(LIBCHECK_CFLAGS)
>>  sigbus_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBCHECK_LIBS)
>>
>> +if HAVE_GLIB20
>>  gtk_test_SOURCES = tests/gtk-test.c
>>  gtk_test_LDADD = $(AM_LDADD) $(GTK30_LIBS) libpulse-mainloop-glib.la libpulse.la
>>  gtk_test_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
>>  gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
>> +endif
>>
>>  alsa_time_test_SOURCES = tests/alsa-time-test.c
>>  alsa_time_test_LDADD = $(AM_LDADD) $(ASOUNDLIB_LIBS)
>> @@ -894,10 +898,12 @@ libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
>>  libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la
>>  libpulse_simple_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_SIMPLE_VERSION_INFO)
>>
>> +if HAVE_GLIB20
>>  libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
>>  libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
>>  libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecommon- at PA_MAJORMINOR@.la $(GLIB20_LIBS)
>>  libpulse_mainloop_glib_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
>> +endif
>>
>>  ###################################
>>  #         OSS emulation           #
>
> Did you try reproducing the bug, and did your change fix it? I believe
> the bug was already fixed in
> https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=36d9ae9b2b79950d7e8c7ff2415071f7ea5f9dbd

Ugh, right.

-- Arun